From 0f92dd542b65bc910caaf190b7c623aa5158c86a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 14 Nov 2011 22:33:41 -0600 Subject: Fix native TQt3 accidental conversion to tquit --- examples/README | 2 +- examples/action/application.cpp | 2 +- examples/action/main.cpp | 2 +- examples/addressbook/main.cpp | 2 +- examples/addressbook/mainwindow.cpp | 2 +- examples/application/main.cpp | 2 +- examples/canvas/canvas.cpp | 2 +- examples/canvas/main.cpp | 2 +- examples/chart/chartform.cpp | 2 +- examples/customlayout/main.cpp | 2 +- examples/demo/textdrawing/textedit.cpp | 2 +- examples/distributor/main.cpp | 2 +- examples/dragdrop/main.cpp | 2 +- examples/extension/main.cpp | 2 +- examples/extension/mainform.ui | 8 ++++---- examples/extension/mainform.ui.h | 2 +- examples/hello/main.cpp | 2 +- examples/helpdemo/doc/manual.html | 2 +- examples/helpdemo/main.cpp | 2 +- examples/helpviewer/main.cpp | 2 +- examples/i18n/main.cpp | 2 +- examples/i18n/mywidget.cpp | 2 +- examples/layout/layout.cpp | 2 +- examples/life/lifedlg.cpp | 2 +- examples/mdi/main.cpp | 2 +- examples/menu/menu.cpp | 2 +- examples/movies/main.cpp | 6 +++--- examples/network/archivesearch/main.cpp | 2 +- examples/network/clientserver/client/client.cpp | 4 ++-- examples/network/clientserver/server/server.cpp | 6 +++--- examples/network/httpd/httpd.cpp | 4 ++-- examples/network/infoprotocol/infoclient/client.cpp | 2 +- examples/network/infoprotocol/infoserver/server.cpp | 2 +- examples/network/infoprotocol/infourlclient/client.cpp | 2 +- examples/network/networkprotocol/nntp.cpp | 2 +- examples/network/remotecontrol/main.cpp | 2 +- examples/network/remotecontrol/remotectrl.ui | 4 ++-- examples/opengl/box/globjwin.cpp | 2 +- examples/opengl/glpixmap/globjwin.cpp | 2 +- examples/opengl/overlay/globjwin.cpp | 2 +- examples/opengl/sharedbox/globjwin.cpp | 2 +- examples/opengl/texture/globjwin.cpp | 2 +- examples/picture/picture.cpp | 2 +- examples/process/process.cpp | 8 ++++---- examples/progress/progress.cpp | 2 +- examples/qmag/qmag.cpp | 18 +++++++++--------- examples/qmag/qmag.doc | 2 +- examples/qwerty/main.cpp | 2 +- examples/regexptester/main.cpp | 2 +- examples/regexptester/regexptester.cpp | 8 ++++---- examples/regexptester/regexptester.h | 2 +- examples/richtext/richtext.cpp | 2 +- examples/rot13/rot13.cpp | 8 ++++---- examples/scrollview/scrollview.cpp | 6 +++--- examples/showimg/main.cpp | 2 +- examples/showimg/showimg.cpp | 2 +- examples/sound/sound.cpp | 2 +- examples/tabdialog/tabdialog.cpp | 2 +- examples/tetrix/qtetrix.cpp | 12 ++++++------ examples/tetrix/qtetrix.h | 4 ++-- examples/textedit/main.cpp | 2 +- examples/textedit/textedit.cpp | 2 +- examples/themes/themes.cpp | 2 +- examples/tictac/tictac.cpp | 6 +++--- examples/tictac/tictac.h | 4 ++-- examples/widgets/widgets.cpp | 2 +- 66 files changed, 104 insertions(+), 104 deletions(-) (limited to 'examples') diff --git a/examples/README b/examples/README index eaf566bf5..e8c0a570e 100644 --- a/examples/README +++ b/examples/README @@ -285,7 +285,7 @@ qfd qmag This is a simple magnifier-type program. It shows how one can do - some tquite low-level operations portably using Qt. + some quite low-level operations portably using Qt. qwerty Simple text editor for testing different character encodings. diff --git a/examples/action/application.cpp b/examples/action/application.cpp index 23a3a8755..9cea0a45e 100644 --- a/examples/action/application.cpp +++ b/examples/action/application.cpp @@ -93,7 +93,7 @@ ApplicationWindow::ApplicationWindow() SLOT( close() ) ); fileQuitAction = new TQAction( "Quit", "&Quit", CTRL+Key_Q, this, - "tquit" ); + "quit" ); connect( fileQuitAction, SIGNAL( activated() ) , qApp, SLOT( closeAllWindows() ) ); diff --git a/examples/action/main.cpp b/examples/action/main.cpp index 215211630..3c632611d 100644 --- a/examples/action/main.cpp +++ b/examples/action/main.cpp @@ -15,6 +15,6 @@ int main( int argc, char ** argv ) { ApplicationWindow * mw = new ApplicationWindow(); mw->setCaption( "Document 1" ); mw->show(); - a.connect( &a, SIGNAL(lastWindowClosed()), &a, SLOT(tquit()) ); + a.connect( &a, SIGNAL(lastWindowClosed()), &a, SLOT(quit()) ); return a.exec(); } diff --git a/examples/addressbook/main.cpp b/examples/addressbook/main.cpp index 33b69833e..c1df2139b 100644 --- a/examples/addressbook/main.cpp +++ b/examples/addressbook/main.cpp @@ -20,7 +20,7 @@ int main( int argc, char ** argv ) a.setMainWidget( mw ); mw->show(); - a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( tquit() ) ); + a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) ); int result = a.exec(); delete mw; return result; diff --git a/examples/addressbook/mainwindow.cpp b/examples/addressbook/mainwindow.cpp index e6f705b57..4d2d1fdd3 100644 --- a/examples/addressbook/mainwindow.cpp +++ b/examples/addressbook/mainwindow.cpp @@ -47,7 +47,7 @@ void ABMainWindow::setupMenuBar() file->insertItem( TQPixmap( "fileprint.xpm" ), "Print...", this, SLOT( filePrint() ), CTRL + Key_P ); file->insertSeparator(); file->insertItem( "Close", this, SLOT( closeWindow() ), CTRL + Key_W ); - file->insertItem( "Quit", qApp, SLOT( tquit() ), CTRL + Key_Q ); + file->insertItem( "Quit", qApp, SLOT( quit() ), CTRL + Key_Q ); } void ABMainWindow::setupFileTools() diff --git a/examples/application/main.cpp b/examples/application/main.cpp index f6a4ae3fb..357d448e4 100644 --- a/examples/application/main.cpp +++ b/examples/application/main.cpp @@ -15,6 +15,6 @@ int main( int argc, char ** argv ) { ApplicationWindow *mw = new ApplicationWindow(); mw->setCaption( "TQt Example - Application" ); mw->show(); - a.connect( &a, SIGNAL(lastWindowClosed()), &a, SLOT(tquit()) ); + a.connect( &a, SIGNAL(lastWindowClosed()), &a, SLOT(quit()) ); return a.exec(); } diff --git a/examples/canvas/canvas.cpp b/examples/canvas/canvas.cpp index 0be872859..5dfd8e0ab 100644 --- a/examples/canvas/canvas.cpp +++ b/examples/canvas/canvas.cpp @@ -319,7 +319,7 @@ Main::Main(TQCanvas& c, TQWidget* parent, const char* name, WFlags f) : file->insertSeparator(); file->insertItem("&Print...", this, SLOT(print()), CTRL+Key_P); file->insertSeparator(); - file->insertItem("E&xit", qApp, SLOT(tquit()), CTRL+Key_Q); + file->insertItem("E&xit", qApp, SLOT(quit()), CTRL+Key_Q); menu->insertItem("&File", file); TQPopupMenu* edit = new TQPopupMenu( menu ); diff --git a/examples/canvas/main.cpp b/examples/canvas/main.cpp index 3666ae95a..65e8a5d02 100644 --- a/examples/canvas/main.cpp +++ b/examples/canvas/main.cpp @@ -36,7 +36,7 @@ int main(int argc, char** argv) else m.showMaximized(); - TQObject::connect( qApp, SIGNAL(lastWindowClosed()), qApp, SLOT(tquit()) ); + TQObject::connect( qApp, SIGNAL(lastWindowClosed()), qApp, SLOT(quit()) ); return app.exec(); } diff --git a/examples/chart/chartform.cpp b/examples/chart/chartform.cpp index 4317b8f0b..43b26af7c 100644 --- a/examples/chart/chartform.cpp +++ b/examples/chart/chartform.cpp @@ -126,7 +126,7 @@ ChartForm::ChartForm( const TQString& filename ) connect( optionsSetOptionsAction, SIGNAL( activated() ), this, SLOT( optionsSetOptions() ) ); - fileQuitAction = new TQAction( "Quit", "&Quit", CTRL+Key_Q, this, "tquit" ); + fileQuitAction = new TQAction( "Quit", "&Quit", CTRL+Key_Q, this, "quit" ); connect( fileQuitAction, SIGNAL( activated() ), this, SLOT( fileQuit() ) ); diff --git a/examples/customlayout/main.cpp b/examples/customlayout/main.cpp index 694fcf8fb..4f2d15e12 100644 --- a/examples/customlayout/main.cpp +++ b/examples/customlayout/main.cpp @@ -36,7 +36,7 @@ int main( int argc, char **argv ) b1->add( new TQPushButton( "More text", f ) ); b1->add( new TQPushButton( "Even longer button text", f ) ); TQPushButton* qb = new TQPushButton( "Quit", f ); - a.connect( qb, SIGNAL( clicked() ), SLOT( tquit() ) ); + a.connect( qb, SIGNAL( clicked() ), SLOT( quit() ) ); b1->add( qb ); TQWidget *wid = new TQWidget( f ); diff --git a/examples/demo/textdrawing/textedit.cpp b/examples/demo/textdrawing/textedit.cpp index 57949a7a7..515523b4b 100644 --- a/examples/demo/textdrawing/textedit.cpp +++ b/examples/demo/textdrawing/textedit.cpp @@ -316,7 +316,7 @@ void TextEdit::fileClose() void TextEdit::fileExit() { - qApp->tquit(); + qApp->quit(); } void TextEdit::editUndo() diff --git a/examples/distributor/main.cpp b/examples/distributor/main.cpp index 2a8a30cbe..9813afd82 100644 --- a/examples/distributor/main.cpp +++ b/examples/distributor/main.cpp @@ -6,6 +6,6 @@ int main( int argc, char ** argv ) TQApplication a( argc, argv ); Distributor w; w.show(); - a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( tquit() ) ); + a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) ); return a.exec(); } diff --git a/examples/dragdrop/main.cpp b/examples/dragdrop/main.cpp index 539c8251a..91676c562 100644 --- a/examples/dragdrop/main.cpp +++ b/examples/dragdrop/main.cpp @@ -68,6 +68,6 @@ int main( int argc, char ** argv ) mw3.setCaption( "TQt Example - Drag and Drop" ); mw3.show(); - TQObject::connect(qApp,SIGNAL(lastWindowClosed()),qApp,SLOT(tquit())); + TQObject::connect(qApp,SIGNAL(lastWindowClosed()),qApp,SLOT(quit())); return a.exec(); } diff --git a/examples/extension/main.cpp b/examples/extension/main.cpp index 608ef06a6..4266b807c 100644 --- a/examples/extension/main.cpp +++ b/examples/extension/main.cpp @@ -6,6 +6,6 @@ int main( int argc, char ** argv ) TQApplication a( argc, argv ); MainForm *w = new MainForm; w->show(); - a.connect( &a, SIGNAL( lastWindowClosed() ), w, SLOT( tquit() ) ); + a.connect( &a, SIGNAL( lastWindowClosed() ), w, SLOT( quit() ) ); return a.exec(); } diff --git a/examples/extension/mainform.ui b/examples/extension/mainform.ui index db156785b..6afd73f46 100644 --- a/examples/extension/mainform.ui +++ b/examples/extension/mainform.ui @@ -29,7 +29,7 @@ - tquitPushButton + quitPushButton &Quit @@ -45,10 +45,10 @@ optionsDlg() - tquitPushButton + quitPushButton clicked() MainForm - tquit() + quit() @@ -64,7 +64,7 @@ optionsDlg() - tquit() + quit() init() diff --git a/examples/extension/mainform.ui.h b/examples/extension/mainform.ui.h index 82fc700d0..c531b997b 100644 --- a/examples/extension/mainform.ui.h +++ b/examples/extension/mainform.ui.h @@ -40,7 +40,7 @@ void MainForm::optionsDlg() } -void MainForm::tquit() +void MainForm::quit() { TQApplication::exit( 0 ); } diff --git a/examples/hello/main.cpp b/examples/hello/main.cpp index 45e9e58e7..d8e401b3b 100644 --- a/examples/hello/main.cpp +++ b/examples/hello/main.cpp @@ -31,7 +31,7 @@ int main( int argc, char **argv ) #ifndef QT_NO_WIDGET_TOPEXTRA // for TQt/Embedded minimal build h.setCaption( "TQt says hello" ); #endif - TQObject::connect( &h, SIGNAL(clicked()), &a, SLOT(tquit()) ); + TQObject::connect( &h, SIGNAL(clicked()), &a, SLOT(quit()) ); h.setFont( TQFont("times",32,TQFont::Bold) ); // default font h.setBackgroundColor( TQt::white ); // default bg color a.setMainWidget( &h ); diff --git a/examples/helpdemo/doc/manual.html b/examples/helpdemo/doc/manual.html index 8410a99d5..7816c7f00 100644 --- a/examples/helpdemo/doc/manual.html +++ b/examples/helpdemo/doc/manual.html @@ -60,6 +60,6 @@





Close Button

-

Click this button to tquit this example application.

+

Click this button to quit this example application.

diff --git a/examples/helpdemo/main.cpp b/examples/helpdemo/main.cpp index c044c1797..8cb339954 100644 --- a/examples/helpdemo/main.cpp +++ b/examples/helpdemo/main.cpp @@ -6,6 +6,6 @@ int main( int argc, char ** argv ) TQApplication a( argc, argv ); HelpDemo help; help.show(); - a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( tquit() ) ); + a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) ); return a.exec(); } diff --git a/examples/helpviewer/main.cpp b/examples/helpviewer/main.cpp index 20ddd2deb..d6264c09f 100644 --- a/examples/helpviewer/main.cpp +++ b/examples/helpviewer/main.cpp @@ -35,7 +35,7 @@ int main( int argc, char ** argv ) help->showMaximized(); TQObject::connect( &a, SIGNAL(lastWindowClosed()), - &a, SLOT(tquit()) ); + &a, SLOT(quit()) ); return a.exec(); } diff --git a/examples/i18n/main.cpp b/examples/i18n/main.cpp index 2c9fb2fc3..adc8728f0 100644 --- a/examples/i18n/main.cpp +++ b/examples/i18n/main.cpp @@ -135,7 +135,7 @@ int main( int argc, char** argv ) MyWidget* w = showLang((const char*)qm[i]); if( w == 0 ) exit( 0 ); - TQObject::connect(w, SIGNAL(closed()), qApp, SLOT(tquit())); + TQObject::connect(w, SIGNAL(closed()), qApp, SLOT(quit())); w->setGeometry(x,y,197,356); w->show(); if ( tight ) { diff --git a/examples/i18n/mywidget.cpp b/examples/i18n/mywidget.cpp index 94e21144e..c31483f6e 100644 --- a/examples/i18n/mywidget.cpp +++ b/examples/i18n/mywidget.cpp @@ -32,7 +32,7 @@ MyWidget::MyWidget( TQWidget* parent, const char* name ) setCentralWidget(central); TQPopupMenu* file = new TQPopupMenu(this); - file->insertItem( tr("E&xit"), qApp, SLOT(tquit()), + file->insertItem( tr("E&xit"), qApp, SLOT(quit()), TQAccel::stringToKey(tr("Ctrl+Q")) ); menuBar()->insertItem( tr("&File"), file ); diff --git a/examples/layout/layout.cpp b/examples/layout/layout.cpp index 26f2a8d14..9e2034a33 100644 --- a/examples/layout/layout.cpp +++ b/examples/layout/layout.cpp @@ -36,7 +36,7 @@ ExampleWidget::ExampleWidget( TQWidget *parent, const char *name ) menubar->setSeparator( TQMenuBar::InWindowsStyle ); TQPopupMenu* popup; popup = new TQPopupMenu( this ); - popup->insertItem( "&Quit", qApp, SLOT(tquit()) ); + popup->insertItem( "&Quit", qApp, SLOT(quit()) ); menubar->insertItem( "&File", popup ); // ...and tell the layout about it. diff --git a/examples/life/lifedlg.cpp b/examples/life/lifedlg.cpp index 1f9af427c..a7beffaac 100644 --- a/examples/life/lifedlg.cpp +++ b/examples/life/lifedlg.cpp @@ -55,7 +55,7 @@ LifeDialog::LifeDialog( int scale, TQWidget * parent, const char * name ) life->move( SIDEBORDER, TOPBORDER ); - connect( qb, SIGNAL(clicked()), qApp, SLOT(tquit()) ); + connect( qb, SIGNAL(clicked()), qApp, SLOT(quit()) ); qb->setGeometry( SIDEBORDER, SIDEBORDER, qb->sizeHint().width(), 25 ); timer = new LifeTimer( this ); diff --git a/examples/mdi/main.cpp b/examples/mdi/main.cpp index 1bda1da23..5892ac983 100644 --- a/examples/mdi/main.cpp +++ b/examples/mdi/main.cpp @@ -16,7 +16,7 @@ int main( int argc, char ** argv ) { a.setMainWidget(mw); mw->setCaption( "TQt Example - Multiple Documents Interface (MDI)" ); mw->show(); - a.connect( &a, SIGNAL(lastWindowClosed()), &a, SLOT(tquit()) ); + a.connect( &a, SIGNAL(lastWindowClosed()), &a, SLOT(quit()) ); int res = a.exec(); return res; } diff --git a/examples/menu/menu.cpp b/examples/menu/menu.cpp index f71b8152d..d7bf39783 100644 --- a/examples/menu/menu.cpp +++ b/examples/menu/menu.cpp @@ -137,7 +137,7 @@ MenuExample::MenuExample( TQWidget *parent, const char *name ) file->insertSeparator(); file->insertItem( "&Print", print, CTRL+Key_P ); file->insertSeparator(); - file->insertItem( "E&xit", qApp, SLOT(tquit()), CTRL+Key_Q ); + file->insertItem( "E&xit", qApp, SLOT(quit()), CTRL+Key_Q ); TQPopupMenu *edit = new TQPopupMenu( this ); Q_CHECK_PTR( edit ); diff --git a/examples/movies/main.cpp b/examples/movies/main.cpp index 5aaea565f..abb1cf0b5 100644 --- a/examples/movies/main.cpp +++ b/examples/movies/main.cpp @@ -225,7 +225,7 @@ public: public slots: void startMovie(const TQString& filename); // TQDialog's method - normally closes the file dialog. - // We want it left open, and we want Cancel to tquit everything. + // We want it left open, and we want Cancel to quit everything. void done( int r ); }; @@ -251,7 +251,7 @@ void MovieStarter::startMovie(const TQString& filename) void MovieStarter::done( int r ) { if (r != Accepted) - qApp->tquit(); // end on Cancel + qApp->quit(); // end on Cancel setResult( r ); // And don't hide. @@ -276,7 +276,7 @@ int main(int argc, char **argv) (void)new MovieScreen(argv[arg], TQMovie(argv[arg]), 0, 0, TQt::WDestructiveClose); } - TQObject::connect(qApp, SIGNAL(lastWindowClosed()), qApp, SLOT(tquit())); + TQObject::connect(qApp, SIGNAL(lastWindowClosed()), qApp, SLOT(quit())); } else { // "GUI" mode - open a chooser for movies // diff --git a/examples/network/archivesearch/main.cpp b/examples/network/archivesearch/main.cpp index c08a00031..8a8588a1a 100644 --- a/examples/network/archivesearch/main.cpp +++ b/examples/network/archivesearch/main.cpp @@ -17,7 +17,7 @@ int main(int argc, char **argv) ad.show(); TQObject::connect( &a, SIGNAL(lastWindowClosed()), - &a, SLOT(tquit()) ); + &a, SLOT(quit()) ); return a.exec(); } diff --git a/examples/network/clientserver/client/client.cpp b/examples/network/clientserver/client/client.cpp index d76b59a9d..0155a4fa1 100644 --- a/examples/network/clientserver/client/client.cpp +++ b/examples/network/clientserver/client/client.cpp @@ -30,11 +30,11 @@ public: inputText = new TQLineEdit( hb ); TQPushButton *send = new TQPushButton( tr("Send") , hb ); TQPushButton *close = new TQPushButton( tr("Close connection") , this ); - TQPushButton *tquit = new TQPushButton( tr("Quit") , this ); + TQPushButton *quit = new TQPushButton( tr("Quit") , this ); connect( send, SIGNAL(clicked()), SLOT(sendToServer()) ); connect( close, SIGNAL(clicked()), SLOT(closeConnection()) ); - connect( tquit, SIGNAL(clicked()), qApp, SLOT(tquit()) ); + connect( quit, SIGNAL(clicked()), qApp, SLOT(quit()) ); // create the socket and connect various of its signals socket = new TQSocket( this ); diff --git a/examples/network/clientserver/server/server.cpp b/examples/network/clientserver/server/server.cpp index f80adda84..b6ac44794 100644 --- a/examples/network/clientserver/server/server.cpp +++ b/examples/network/clientserver/server/server.cpp @@ -118,12 +118,12 @@ public: TQLabel *lb = new TQLabel( itext, this ); lb->setAlignment( AlignHCenter ); infoText = new TQTextView( this ); - TQPushButton *tquit = new TQPushButton( tr("Quit") , this ); + TQPushButton *quit = new TQPushButton( tr("Quit") , this ); connect( server, SIGNAL(newConnect(ClientSocket*)), SLOT(newConnect(ClientSocket*)) ); - connect( tquit, SIGNAL(clicked()), qApp, - SLOT(tquit()) ); + connect( quit, SIGNAL(clicked()), qApp, + SLOT(quit()) ); } ~ServerInfo() diff --git a/examples/network/httpd/httpd.cpp b/examples/network/httpd/httpd.cpp index fd42891bb..f96fc4554 100644 --- a/examples/network/httpd/httpd.cpp +++ b/examples/network/httpd/httpd.cpp @@ -98,12 +98,12 @@ public: TQLabel *lb = new TQLabel( itext, this ); lb->setAlignment( AlignHCenter ); infoText = new TQTextView( this ); - TQPushButton *tquit = new TQPushButton( "tquit" , this ); + TQPushButton *quit = new TQPushButton( "quit" , this ); connect( httpd, SIGNAL(newConnect()), SLOT(newConnect()) ); connect( httpd, SIGNAL(endConnect()), SLOT(endConnect()) ); connect( httpd, SIGNAL(wroteToClient()), SLOT(wroteToClient()) ); - connect( tquit, SIGNAL(pressed()), qApp, SLOT(tquit()) ); + connect( quit, SIGNAL(pressed()), qApp, SLOT(quit()) ); } ~HttpInfo() diff --git a/examples/network/infoprotocol/infoclient/client.cpp b/examples/network/infoprotocol/infoclient/client.cpp index 24861ab55..a1852eb2e 100644 --- a/examples/network/infoprotocol/infoclient/client.cpp +++ b/examples/network/infoprotocol/infoclient/client.cpp @@ -28,7 +28,7 @@ ClientInfo::ClientInfo( TQWidget *parent, const char *name ) : connect( infoList, SIGNAL(selected(const TQString&)), SLOT(selectItem(const TQString&)) ); connect( btnConnect, SIGNAL(clicked()), SLOT(connectToServer()) ); connect( btnBack, SIGNAL(clicked()), SLOT(stepBack()) ); - connect( btnQuit, SIGNAL(clicked()), qApp, SLOT(tquit()) ); + connect( btnQuit, SIGNAL(clicked()), qApp, SLOT(quit()) ); } diff --git a/examples/network/infoprotocol/infoserver/server.cpp b/examples/network/infoprotocol/infoserver/server.cpp index 4e5ef6d17..e85e6120b 100644 --- a/examples/network/infoprotocol/infoserver/server.cpp +++ b/examples/network/infoprotocol/infoserver/server.cpp @@ -23,7 +23,7 @@ ServerInfo::ServerInfo( Q_UINT16 port, TQWidget *parent, const char *name ) : { SimpleServer *server = new SimpleServer( port, this, "simple server" ); connect( server, SIGNAL(newConnect()), SLOT(newConnect()) ); - connect( btnQuit, SIGNAL(clicked()), qApp, SLOT(tquit()) ); + connect( btnQuit, SIGNAL(clicked()), qApp, SLOT(quit()) ); } void ServerInfo::newConnect() diff --git a/examples/network/infoprotocol/infourlclient/client.cpp b/examples/network/infoprotocol/infourlclient/client.cpp index ba61d3b31..a1625e299 100644 --- a/examples/network/infoprotocol/infourlclient/client.cpp +++ b/examples/network/infoprotocol/infourlclient/client.cpp @@ -22,7 +22,7 @@ ClientInfo::ClientInfo( TQWidget *parent, const char *name ) : ClientInfoBase( parent, name ) { connect( btnOpen, SIGNAL(clicked()), SLOT(downloadFile()) ); - connect( btnQuit, SIGNAL(clicked()), qApp, SLOT(tquit()) ); + connect( btnQuit, SIGNAL(clicked()), qApp, SLOT(quit()) ); connect( &op, SIGNAL( data( const TQByteArray &, TQNetworkOperation * ) ), this, SLOT( newData( const TQByteArray & ) ) ); } diff --git a/examples/network/networkprotocol/nntp.cpp b/examples/network/networkprotocol/nntp.cpp index eccc1f974..6a4e1245a 100644 --- a/examples/network/networkprotocol/nntp.cpp +++ b/examples/network/networkprotocol/nntp.cpp @@ -103,7 +103,7 @@ void Nntp::close() { // close the command socket if ( commandSocket->isOpen() ) { - commandSocket->writeBlock( "tquit\r\n", strlen( "tquit\r\n" ) ); + commandSocket->writeBlock( "quit\r\n", strlen( "quit\r\n" ) ); commandSocket->close(); } } diff --git a/examples/network/remotecontrol/main.cpp b/examples/network/remotecontrol/main.cpp index c153d02d2..c617df233 100644 --- a/examples/network/remotecontrol/main.cpp +++ b/examples/network/remotecontrol/main.cpp @@ -6,6 +6,6 @@ int main( int argc, char **argv ) { TQApplication a( argc, argv ); StartUp s; - TQObject::connect( &a, SIGNAL(lastWindowClosed()), &a, SLOT(tquit()) ); + TQObject::connect( &a, SIGNAL(lastWindowClosed()), &a, SLOT(quit()) ); return a.exec(); } diff --git a/examples/network/remotecontrol/remotectrl.ui b/examples/network/remotecontrol/remotectrl.ui index c28482ff2..13a9fd792 100644 --- a/examples/network/remotecontrol/remotectrl.ui +++ b/examples/network/remotecontrol/remotectrl.ui @@ -123,7 +123,7 @@ - tquitButton + quitButton &Quit @@ -135,7 +135,7 @@ - tquitButton + quitButton clicked() RemoteCtrl close() diff --git a/examples/opengl/box/globjwin.cpp b/examples/opengl/box/globjwin.cpp index f4af52c36..4d88f2401 100644 --- a/examples/opengl/box/globjwin.cpp +++ b/examples/opengl/box/globjwin.cpp @@ -25,7 +25,7 @@ GLObjectWindow::GLObjectWindow( TQWidget* parent, const char* name ) // Create a menu TQPopupMenu *file = new TQPopupMenu( this ); - file->insertItem( "Exit", qApp, SLOT(tquit()), CTRL+Key_Q ); + file->insertItem( "Exit", qApp, SLOT(quit()), CTRL+Key_Q ); // Create a menu bar TQMenuBar *m = new TQMenuBar( this ); diff --git a/examples/opengl/glpixmap/globjwin.cpp b/examples/opengl/glpixmap/globjwin.cpp index 6341c3e07..c7cd9b673 100644 --- a/examples/opengl/glpixmap/globjwin.cpp +++ b/examples/opengl/glpixmap/globjwin.cpp @@ -46,7 +46,7 @@ GLObjectWindow::GLObjectWindow( TQWidget* parent, const char* name ) insertMenuItemId = file->insertItem( "Insert Pixmap Here", this, SLOT(makePixmapForMenu()) ); file->insertSeparator(); - file->insertItem( "Exit", qApp, SLOT(tquit()), CTRL+Key_Q ); + file->insertItem( "Exit", qApp, SLOT(quit()), CTRL+Key_Q ); // Create a menu bar TQMenuBar *m = new TQMenuBar( this ); diff --git a/examples/opengl/overlay/globjwin.cpp b/examples/opengl/overlay/globjwin.cpp index fd5545512..24dda2fad 100644 --- a/examples/opengl/overlay/globjwin.cpp +++ b/examples/opengl/overlay/globjwin.cpp @@ -22,7 +22,7 @@ GLObjectWindow::GLObjectWindow( TQWidget* parent, const char* name ) { // Create a menu TQPopupMenu *file = new TQPopupMenu( this ); - file->insertItem( "Exit", qApp, SLOT(tquit()), CTRL+Key_Q ); + file->insertItem( "Exit", qApp, SLOT(quit()), CTRL+Key_Q ); // Create a menu bar TQMenuBar *m = new TQMenuBar( this ); diff --git a/examples/opengl/sharedbox/globjwin.cpp b/examples/opengl/sharedbox/globjwin.cpp index f908add4b..0b0a60491 100644 --- a/examples/opengl/sharedbox/globjwin.cpp +++ b/examples/opengl/sharedbox/globjwin.cpp @@ -26,7 +26,7 @@ GLObjectWindow::GLObjectWindow( TQWidget* parent, const char* name ) TQPopupMenu *file = new TQPopupMenu( this ); file->insertItem( "Delete Left TQGLWidget", this, SLOT(deleteFirstWidget()) ); - file->insertItem( "Exit", qApp, SLOT(tquit()), CTRL+Key_Q ); + file->insertItem( "Exit", qApp, SLOT(quit()), CTRL+Key_Q ); // Create a menu bar TQMenuBar *m = new TQMenuBar( this ); diff --git a/examples/opengl/texture/globjwin.cpp b/examples/opengl/texture/globjwin.cpp index e46833faf..bb57307e0 100644 --- a/examples/opengl/texture/globjwin.cpp +++ b/examples/opengl/texture/globjwin.cpp @@ -36,7 +36,7 @@ GLObjectWindow::GLObjectWindow( TQWidget* parent, const char* name ) file->insertItem( "Toggle Animation", c, SLOT(toggleAnimation()), CTRL+Key_A ); file->insertSeparator(); - file->insertItem( "Exit", qApp, SLOT(tquit()), CTRL+Key_Q ); + file->insertItem( "Exit", qApp, SLOT(quit()), CTRL+Key_Q ); // Create a menu bar TQMenuBar *m = new TQMenuBar( this ); diff --git a/examples/picture/picture.cpp b/examples/picture/picture.cpp index 44420d084..d04f18897 100644 --- a/examples/picture/picture.cpp +++ b/examples/picture/picture.cpp @@ -92,7 +92,7 @@ void PictureDisplay::keyPressEvent( TQKeyEvent *k ) pict->load( name ); update(); break; - case 'q': // tquit + case 'q': // quit TQApplication::exit(); break; } diff --git a/examples/process/process.cpp b/examples/process/process.cpp index 32368dc57..8204d84e9 100644 --- a/examples/process/process.cpp +++ b/examples/process/process.cpp @@ -32,16 +32,16 @@ public slots: private: TQProcess *proc; TQTextView *output; - TQPushButton *tquitButton; + TQPushButton *quitButton; }; UicManager::UicManager() { // Layout output = new TQTextView( this ); - tquitButton = new TQPushButton( tr("Quit"), this ); - connect( tquitButton, SIGNAL(clicked()), - qApp, SLOT(tquit()) ); + quitButton = new TQPushButton( tr("Quit"), this ); + connect( quitButton, SIGNAL(clicked()), + qApp, SLOT(quit()) ); resize( 500, 500 ); // TQProcess related code diff --git a/examples/progress/progress.cpp b/examples/progress/progress.cpp index fa8ff1d60..882d3118a 100644 --- a/examples/progress/progress.cpp +++ b/examples/progress/progress.cpp @@ -151,7 +151,7 @@ public: file->insertItem( drawItemText(i), i ); connect( menubar, SIGNAL(activated(int)), this, SLOT(doMenuItem(int)) ); file->insertSeparator(); - file->insertItem( "Quit", qApp, SLOT(tquit()) ); + file->insertItem( "Quit", qApp, SLOT(quit()) ); options = new TQPopupMenu(); Q_CHECK_PTR( options ); diff --git a/examples/qmag/qmag.cpp b/examples/qmag/qmag.cpp index e747bab40..ca86b6232 100644 --- a/examples/qmag/qmag.cpp +++ b/examples/qmag/qmag.cpp @@ -49,7 +49,7 @@ private: TQComboBox *refresh; TQPushButton *saveButton; TQPushButton *multiSaveButton; - TQPushButton *tquitButton; + TQPushButton *quitButton; TQPixmap pm; // pixmap, magnified TQPixmap p; // pixmap TQImage image; // image of pixmap (for RGB) @@ -126,12 +126,12 @@ MagWidget::MagWidget( TQWidget *parent, const char *name ) multiSaveButton->setGeometry( saveButton->geometry().right() + 2, 2, 10+multiSaveButton->fontMetrics().width("MultiSave"), 20 ); - tquitButton = new TQPushButton( this ); - Q_CHECK_PTR(tquitButton); - connect( tquitButton, SIGNAL(clicked()), qApp, SLOT(tquit()) ); - tquitButton->setText( "Quit" ); - tquitButton->setGeometry( multiSaveButton->geometry().right() + 2, 2, - 10+tquitButton->fontMetrics().width("Quit"), 20 ); + quitButton = new TQPushButton( this ); + Q_CHECK_PTR(quitButton); + connect( quitButton, SIGNAL(clicked()), qApp, SLOT(quit()) ); + quitButton->setText( "Quit" ); + quitButton->setGeometry( multiSaveButton->geometry().right() + 2, 2, + 10+quitButton->fontMetrics().width("Quit"), 20 ); #else zoom = 0; multiSaveButton = 0; @@ -150,8 +150,8 @@ MagWidget::MagWidget( TQWidget *parent, const char *name ) yoffset = zoom->height() // top buttons + 4 // space around top buttons + rgb->height(); // color-value text height - setMinimumSize( tquitButton->pos().x(), yoffset+20 ); - resize( tquitButton->geometry().topRight().x() + 2, yoffset+60 ); + setMinimumSize( quitButton->pos().x(), yoffset+20 ); + resize( quitButton->geometry().topRight().x() + 2, yoffset+60 ); #else yoffset = 0; resize(350,350); diff --git a/examples/qmag/qmag.doc b/examples/qmag/qmag.doc index 5084f395e..f7fac63a5 100644 --- a/examples/qmag/qmag.doc +++ b/examples/qmag/qmag.doc @@ -6,7 +6,7 @@ \title QMag This is a simple magnifier-type program. It shows how one can do - some tquite low-level operations in a portable way using Qt. + some quite low-level operations in a portable way using Qt. Run it, click in the magnifier window, then click where you want to magnify or drag out a rectangle. Two combo boxes let you select diff --git a/examples/qwerty/main.cpp b/examples/qwerty/main.cpp index b514126ec..727a3aaf2 100644 --- a/examples/qwerty/main.cpp +++ b/examples/qwerty/main.cpp @@ -32,6 +32,6 @@ int main( int argc, char **argv ) e->show(); } } - a.connect( &a, SIGNAL(lastWindowClosed()), &a, SLOT(tquit()) ); + a.connect( &a, SIGNAL(lastWindowClosed()), &a, SLOT(quit()) ); return a.exec(); } diff --git a/examples/regexptester/main.cpp b/examples/regexptester/main.cpp index 493c955af..1e0949c7a 100644 --- a/examples/regexptester/main.cpp +++ b/examples/regexptester/main.cpp @@ -6,6 +6,6 @@ int main(int argc, char **argv) TQApplication app(argc, argv); RegexpTester form; form.show(); - app.connect(&app, SIGNAL(lastWindowClosed()), &app, SLOT(tquit())); + app.connect(&app, SIGNAL(lastWindowClosed()), &app, SLOT(quit())); return app.exec(); } diff --git a/examples/regexptester/regexptester.cpp b/examples/regexptester/regexptester.cpp index 326c02048..91e544de9 100644 --- a/examples/regexptester/regexptester.cpp +++ b/examples/regexptester/regexptester.cpp @@ -39,7 +39,7 @@ RegexpTester::RegexpTester(TQWidget* parent, const char* name, bool modal, executePushButton = new TQPushButton(this); executePushButton->setDefault(true); copyPushButton = new TQPushButton(this); - tquitPushButton = new TQPushButton(this); + quitPushButton = new TQPushButton(this); statusBar = new TQStatusBar(this); TQGridLayout *gridLayout = new TQGridLayout(2, 2, 6); @@ -55,7 +55,7 @@ RegexpTester::RegexpTester(TQWidget* parent, const char* name, bool modal, TQVBoxLayout *buttonLayout = new TQVBoxLayout(0, 6, 6); buttonLayout->addWidget(executePushButton); buttonLayout->addWidget(copyPushButton); - buttonLayout->addWidget(tquitPushButton); + buttonLayout->addWidget(quitPushButton); buttonLayout->addStretch(1); TQHBoxLayout *middleLayout = new TQHBoxLayout(0, 6, 6); middleLayout->addWidget(resultTable); @@ -72,7 +72,7 @@ RegexpTester::RegexpTester(TQWidget* parent, const char* name, bool modal, connect(copyPushButton, SIGNAL(clicked()), this, SLOT(copy())); connect(executePushButton, SIGNAL(clicked()), this, SLOT(execute())); - connect(tquitPushButton, SIGNAL(clicked()), this, SLOT(accept())); + connect(quitPushButton, SIGNAL(clicked()), this, SLOT(accept())); execute(); } @@ -174,6 +174,6 @@ void RegexpTester::languageChange() wildcardCheckBox->setText(tr("&Wildcard")); copyPushButton->setText(tr("&Copy")); executePushButton->setText(tr("&Execute")); - tquitPushButton->setText(tr("&Quit")); + quitPushButton->setText(tr("&Quit")); } diff --git a/examples/regexptester/regexptester.h b/examples/regexptester/regexptester.h index faff773bf..5bed34a14 100644 --- a/examples/regexptester/regexptester.h +++ b/examples/regexptester/regexptester.h @@ -28,7 +28,7 @@ public: TQTable *resultTable; TQPushButton *executePushButton; TQPushButton *copyPushButton; - TQPushButton *tquitPushButton; + TQPushButton *quitPushButton; TQStatusBar *statusBar; public slots: diff --git a/examples/richtext/richtext.cpp b/examples/richtext/richtext.cpp index e2b393eae..e12aaf0bf 100644 --- a/examples/richtext/richtext.cpp +++ b/examples/richtext/richtext.cpp @@ -100,7 +100,7 @@ MyRichText::MyRichText( TQWidget *parent, const char *name ) bPrev->setEnabled( FALSE ); - connect( bClose, SIGNAL( clicked() ), qApp, SLOT( tquit() ) ); + connect( bClose, SIGNAL( clicked() ), qApp, SLOT( quit() ) ); connect( bPrev, SIGNAL( clicked() ), this, SLOT( prev() ) ); connect( bNext, SIGNAL( clicked() ), this, SLOT( next() ) ); diff --git a/examples/rot13/rot13.cpp b/examples/rot13/rot13.cpp index 967c72de7..e44d7b87b 100644 --- a/examples/rot13/rot13.cpp +++ b/examples/rot13/rot13.cpp @@ -21,14 +21,14 @@ Rot13::Rot13() connect( left, SIGNAL(textChanged()), this, SLOT(changeRight()) ); connect( right, SIGNAL(textChanged()), this, SLOT(changeLeft()) ); - TQPushButton * tquit = new TQPushButton( "&Quit", this ); - tquit->setFocusPolicy( NoFocus ); - connect( tquit, SIGNAL(clicked()), qApp, SLOT(tquit()) ); + TQPushButton * quit = new TQPushButton( "&Quit", this ); + quit->setFocusPolicy( NoFocus ); + connect( quit, SIGNAL(clicked()), qApp, SLOT(quit()) ); TQGridLayout * l = new TQGridLayout( this, 2, 2, 5 ); l->addWidget( left, 0, 0 ); l->addWidget( right, 0, 1 ); - l->addWidget( tquit, 1, 1, AlignRight ); + l->addWidget( quit, 1, 1, AlignRight ); left->setFocus(); } diff --git a/examples/scrollview/scrollview.cpp b/examples/scrollview/scrollview.cpp index 994cd292c..4e0cfcf15 100644 --- a/examples/scrollview/scrollview.cpp +++ b/examples/scrollview/scrollview.cpp @@ -43,7 +43,7 @@ public: for (int y=0; y<2000-h; y+=h+10) { if (y == 0) { TQButton* q=new TQPushButton("Quit", this); - connect(q, SIGNAL(clicked()), qApp, SLOT(tquit())); + connect(q, SIGNAL(clicked()), qApp, SLOT(quit())); } else { TQString str; if ( b > 0 ) { @@ -207,7 +207,7 @@ public: TQPopupMenu* file = new TQPopupMenu( menubar ); Q_CHECK_PTR( file ); menubar->insertItem( "&File", file ); - file->insertItem( "Quit", qApp, SLOT(tquit()) ); + file->insertItem( "Quit", qApp, SLOT(quit()) ); vp_options = new TQPopupMenu( menubar ); Q_CHECK_PTR( vp_options ); @@ -433,7 +433,7 @@ int main( int argc, char **argv ) ve3.setCaption("TQt Example - Scrollviews"); ve3.show(); - TQObject::connect(qApp, SIGNAL(lastWindowClosed()), qApp, SLOT(tquit())); + TQObject::connect(qApp, SIGNAL(lastWindowClosed()), qApp, SLOT(quit())); return a.exec(); } diff --git a/examples/showimg/main.cpp b/examples/showimg/main.cpp index 213b91216..e8c936b83 100644 --- a/examples/showimg/main.cpp +++ b/examples/showimg/main.cpp @@ -50,7 +50,7 @@ int main( int argc, char **argv ) } } - TQObject::connect(qApp, SIGNAL(lastWindowClosed()), qApp, SLOT(tquit())); + TQObject::connect(qApp, SIGNAL(lastWindowClosed()), qApp, SLOT(quit())); return a.exec(); } diff --git a/examples/showimg/showimg.cpp b/examples/showimg/showimg.cpp index 905f8184a..7b987af16 100644 --- a/examples/showimg/showimg.cpp +++ b/examples/showimg/showimg.cpp @@ -57,7 +57,7 @@ ImageViewer::ImageViewer( TQWidget *parent, const char *name, int wFlags ) si = file->insertItem( "Save image", saveimage ); sp = file->insertItem( "Save pixmap", savepixmap ); file->insertSeparator(); - file->insertItem( "E&xit", qApp, SLOT(tquit()), CTRL+Key_Q ); + file->insertItem( "E&xit", qApp, SLOT(quit()), CTRL+Key_Q ); edit = new TQPopupMenu( menubar ); menubar->insertItem( "&Edit", edit ); diff --git a/examples/sound/sound.cpp b/examples/sound/sound.cpp index 45ce61563..e020e1a23 100644 --- a/examples/sound/sound.cpp +++ b/examples/sound/sound.cpp @@ -50,7 +50,7 @@ SoundPlayer::SoundPlayer() : file->insertItem("Play 3 and 4 together", this, SLOT(doPlay34())); file->insertItem("Play all together", this, SLOT(doPlay1234())); file->insertSeparator(); - file->insertItem("E&xit", qApp, SLOT(tquit())); + file->insertItem("E&xit", qApp, SLOT(quit())); menuBar()->insertItem("&File", file); } diff --git a/examples/tabdialog/tabdialog.cpp b/examples/tabdialog/tabdialog.cpp index 774b74c73..fd5837d75 100644 --- a/examples/tabdialog/tabdialog.cpp +++ b/examples/tabdialog/tabdialog.cpp @@ -25,7 +25,7 @@ TabDialog::TabDialog( TQWidget *parent, const char *name, const TQString &_filen setupTab2(); setupTab3(); - connect( this, SIGNAL( applyButtonPressed() ), qApp, SLOT( tquit() ) ); + connect( this, SIGNAL( applyButtonPressed() ), qApp, SLOT( quit() ) ); } void TabDialog::setupTab1() diff --git a/examples/tetrix/qtetrix.cpp b/examples/tetrix/qtetrix.cpp index 68b49c254..655c2e71a 100644 --- a/examples/tetrix/qtetrix.cpp +++ b/examples/tetrix/qtetrix.cpp @@ -111,12 +111,12 @@ TQTetrix::TQTetrix( TQWidget *parent, const char *name ) showLines->setFrameStyle(TQFrame::Sunken|TQFrame::Box); showLevel->setFrameStyle(TQFrame::Sunken|TQFrame::Box); #endif - tquitButton = new TQPushButton("&Quit",this); + quitButton = new TQPushButton("&Quit",this); startButton = new TQPushButton("&New Game",this); pauseButton = new TQPushButton("&Pause",this); // Don't let the buttons get keyboard focus - tquitButton->setFocusPolicy( TQWidget::NoFocus ); + quitButton->setFocusPolicy( TQWidget::NoFocus ); startButton->setFocusPolicy( TQWidget::NoFocus ); pauseButton->setFocusPolicy( TQWidget::NoFocus ); @@ -140,7 +140,7 @@ TQTetrix::TQTetrix( TQWidget *parent, const char *name ) SLOT(setNum(int))); #endif connect( startButton, SIGNAL(clicked()), board, SLOT(start()) ); - connect( tquitButton , SIGNAL(clicked()), SLOT(tquit())); + connect( quitButton , SIGNAL(clicked()), SLOT(quit())); connect( pauseButton, SIGNAL(clicked()), board, SLOT(pause()) ); board->setGeometry( 150, 20, 153, 333 ); @@ -158,7 +158,7 @@ TQTetrix::TQTetrix( TQWidget *parent, const char *name ) showLines->setNum( 0 ); #endif startButton->setGeometry( 46, 288, 90, 30 ); - tquitButton->setGeometry( 370, 265, 90, 30 ); + quitButton->setGeometry( 370, 265, 90, 30 ); pauseButton->setGeometry( 370, 310, 90, 30 ); board->revealNextPiece(TRUE); @@ -170,7 +170,7 @@ void TQTetrix::gameOver() } -void TQTetrix::tquit() +void TQTetrix::quit() { - qApp->tquit(); + qApp->quit(); } diff --git a/examples/tetrix/qtetrix.h b/examples/tetrix/qtetrix.h index 36d8bd041..5b39051b0 100644 --- a/examples/tetrix/qtetrix.h +++ b/examples/tetrix/qtetrix.h @@ -46,7 +46,7 @@ public: public slots: void gameOver(); - void tquit(); + void quit(); private: void keyPressEvent( TQKeyEvent *e ) { board->keyPressEvent(e); } @@ -61,7 +61,7 @@ private: TQLabel *showLevel; TQLabel *showLines; #endif - TQPushButton *tquitButton; + TQPushButton *quitButton; TQPushButton *startButton; TQPushButton *pauseButton; }; diff --git a/examples/textedit/main.cpp b/examples/textedit/main.cpp index db2ad21a4..31b5412a3 100644 --- a/examples/textedit/main.cpp +++ b/examples/textedit/main.cpp @@ -17,6 +17,6 @@ int main( int argc, char ** argv ) mw->setCaption( "Richtext Editor" ); mw->resize( 640, 800 ); mw->show(); - a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( tquit() ) ); + a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) ); return a.exec(); } diff --git a/examples/textedit/textedit.cpp b/examples/textedit/textedit.cpp index a64c9d94c..b25074788 100644 --- a/examples/textedit/textedit.cpp +++ b/examples/textedit/textedit.cpp @@ -315,7 +315,7 @@ void TextEdit::fileClose() void TextEdit::fileExit() { - qApp->tquit(); + qApp->quit(); } void TextEdit::editUndo() diff --git a/examples/themes/themes.cpp b/examples/themes/themes.cpp index 6e5b95bb9..f448e3421 100644 --- a/examples/themes/themes.cpp +++ b/examples/themes/themes.cpp @@ -86,7 +86,7 @@ Themes::Themes( TQWidget *parent, const char *name, WFlags f ) } ag->addTo(style); style->insertSeparator(); - style->insertItem("&Quit", qApp, SLOT( tquit() ), CTRL | Key_Q ); + style->insertItem("&Quit", qApp, SLOT( quit() ), CTRL | Key_Q ); TQPopupMenu * help = new TQPopupMenu( this ); menuBar()->insertSeparator(); diff --git a/examples/tictac/tictac.cpp b/examples/tictac/tictac.cpp index 60cd0eb71..e3d15eeac 100644 --- a/examples/tictac/tictac.cpp +++ b/examples/tictac/tictac.cpp @@ -323,12 +323,12 @@ TicTacToe::TicTacToe( int boardSize, TQWidget *parent, const char *name ) newGame = new TQPushButton( "Play!", this ); connect( newGame, SIGNAL(clicked()), SLOT(newGameClicked()) ); - tquit = new TQPushButton( "Quit", this ); - connect( tquit, SIGNAL(clicked()), qApp, SLOT(tquit()) ); + quit = new TQPushButton( "Quit", this ); + connect( quit, SIGNAL(clicked()), qApp, SLOT(quit()) ); TQHBoxLayout * b = new TQHBoxLayout; l->addLayout( b ); b->addWidget( newGame ); - b->addWidget( tquit ); + b->addWidget( quit ); newState(); } diff --git a/examples/tictac/tictac.h b/examples/tictac/tictac.h index 876def88d..72de5278d 100644 --- a/examples/tictac/tictac.h +++ b/examples/tictac/tictac.h @@ -83,7 +83,7 @@ private: // -------------------------------------------------------------------------- // TicTacToe implements the complete game. // TicTacToe is a composite widget that contains a TicTacGameBoard and -// two push buttons for starting the game and tquitting. +// two push buttons for starting the game and quitting. // class TicTacToe : public TQWidget @@ -98,7 +98,7 @@ private: void newState(); TQComboBox *whoStarts; TQPushButton *newGame; - TQPushButton *tquit; + TQPushButton *quit; TQLabel *message; TicTacGameBoard *board; }; diff --git a/examples/widgets/widgets.cpp b/examples/widgets/widgets.cpp index 10ce7ece0..513a6e6eb 100644 --- a/examples/widgets/widgets.cpp +++ b/examples/widgets/widgets.cpp @@ -181,7 +181,7 @@ WidgetView::WidgetView( TQWidget *parent, const char *name ) id = popup->insertItem( openIcon, "&Open...", this, SLOT( open() ) ); popup->insertSeparator(); - popup->insertItem( "Quit", qApp, SLOT(tquit()), CTRL+Key_Q ); + popup->insertItem( "Quit", qApp, SLOT(quit()), CTRL+Key_Q ); textStylePopup = popup = new TQPopupMenu( this ); menuBar()->insertItem( "&Edit", popup ); -- cgit v1.2.1