diff options
author | Timothy Pearson <[email protected]> | 2011-11-14 22:33:41 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2011-11-14 22:33:41 -0600 |
commit | 0f92dd542b65bc910caaf190b7c623aa5158c86a (patch) | |
tree | 120ab7e08fa0ffc354ef58d100f79a33c92aa6e6 /tools | |
parent | d796c9dd933ab96ec83b9a634feedd5d32e1ba3f (diff) | |
download | tqt3-0f92dd542b65bc910caaf190b7c623aa5158c86a.tar.gz tqt3-0f92dd542b65bc910caaf190b7c623aa5158c86a.zip |
Fix native TQt3 accidental conversion to tquit
Diffstat (limited to 'tools')
-rw-r--r-- | tools/assistant/helpdialogimpl.cpp | 2 | ||||
-rw-r--r-- | tools/assistant/main.cpp | 2 | ||||
-rw-r--r-- | tools/designer/designer/configtoolboxdialog.ui.h | 2 | ||||
-rw-r--r-- | tools/designer/designer/listviewdnd.cpp | 2 | ||||
-rw-r--r-- | tools/designer/examples/addressbook/main.cpp | 2 | ||||
-rw-r--r-- | tools/designer/examples/metric/main.cpp | 2 | ||||
-rw-r--r-- | tools/designer/examples/metric/metric.ui | 6 | ||||
-rw-r--r-- | tools/designer/examples/multiclip/multiclip.ui | 6 | ||||
-rw-r--r-- | tools/designer/examples/receiver1/mainform.ui | 4 | ||||
-rw-r--r-- | tools/designer/examples/receiver2/mainform.ui | 4 | ||||
-rw-r--r-- | tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp | 2 | ||||
-rw-r--r-- | tools/designer/plugins/glade/glade2ui.cpp | 2 | ||||
-rw-r--r-- | tools/designer/uilib/test/main.cpp | 2 | ||||
-rw-r--r-- | tools/linguist/book/linguist-programmer.leaf | 16 | ||||
-rw-r--r-- | tools/linguist/book/linguist-translator.leaf | 2 | ||||
-rw-r--r-- | tools/linguist/tutorial/tt2/mainwindow.cpp | 2 | ||||
-rw-r--r-- | tools/linguist/tutorial/tt3/mainwindow.cpp | 2 | ||||
-rw-r--r-- | tools/qconfig/main.cpp | 2 | ||||
-rw-r--r-- | tools/qvfb/qvfb.cpp | 2 |
19 files changed, 32 insertions, 32 deletions
diff --git a/tools/assistant/helpdialogimpl.cpp b/tools/assistant/helpdialogimpl.cpp index 2aa7ecd94..f166b86b5 100644 --- a/tools/assistant/helpdialogimpl.cpp +++ b/tools/assistant/helpdialogimpl.cpp @@ -292,7 +292,7 @@ void HelpDialog::timerEvent(TQTimerEvent *e) help->setWindowOpacity((opacity-=4)/255.0); if (opacity<=0) #endif - qApp->tquit(); + qApp->quit(); } diff --git a/tools/assistant/main.cpp b/tools/assistant/main.cpp index 9e3c9dae9..4d2c82fc9 100644 --- a/tools/assistant/main.cpp +++ b/tools/assistant/main.cpp @@ -332,7 +332,7 @@ int main( int argc, char ** argv ) else if ( file.isEmpty() ) mw->showLinks( links ); - a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( tquit() ) ); + a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) ); int appExec = a.exec(); delete (MainWindow*)mw; diff --git a/tools/designer/designer/configtoolboxdialog.ui.h b/tools/designer/designer/configtoolboxdialog.ui.h index 1ef3884e5..d536310ea 100644 --- a/tools/designer/designer/configtoolboxdialog.ui.h +++ b/tools/designer/designer/configtoolboxdialog.ui.h @@ -102,7 +102,7 @@ void ConfigToolboxDialog::addTool() listViewCommon->ensureItemVisible( i ); } else if ( !addKids ) { // Children processing not set, so set it - // Also find the item were we shall tquit + // Also find the item were we shall quit // processing children...if any such item addKids = TRUE; nextSibling = (*it)->nextSibling(); diff --git a/tools/designer/designer/listviewdnd.cpp b/tools/designer/designer/listviewdnd.cpp index f4191269f..f9fa8d7dd 100644 --- a/tools/designer/designer/listviewdnd.cpp +++ b/tools/designer/designer/listviewdnd.cpp @@ -153,7 +153,7 @@ int ListViewDnd::buildFlatList( ListViewItemList & list ) list.append( *it ); } else if ( !addKids ) { // Children processing not set, so set it - // Also find the item were we shall tquit + // Also find the item were we shall quit // processing children...if any such item addKids = TRUE; nextSibling = (*it)->nextSibling(); diff --git a/tools/designer/examples/addressbook/main.cpp b/tools/designer/examples/addressbook/main.cpp index 76ad63219..f96b6a33f 100644 --- a/tools/designer/examples/addressbook/main.cpp +++ b/tools/designer/examples/addressbook/main.cpp @@ -6,6 +6,6 @@ int main( int argc, char ** argv ) TQApplication a( argc, argv ); AddressBook *w = new AddressBook; w->show(); - a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( tquit() ) ); + a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) ); return a.exec(); } diff --git a/tools/designer/examples/metric/main.cpp b/tools/designer/examples/metric/main.cpp index d7a20ab40..fb7cfc763 100644 --- a/tools/designer/examples/metric/main.cpp +++ b/tools/designer/examples/metric/main.cpp @@ -7,6 +7,6 @@ int main( int argc, char ** argv ) ConversionForm *w = new ConversionForm; w->show(); a.setMainWidget( w ); - a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( tquit() ) ); + a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) ); return a.exec(); } diff --git a/tools/designer/examples/metric/metric.ui b/tools/designer/examples/metric/metric.ui index aba8c2ef0..d2ae5456c 100644 --- a/tools/designer/examples/metric/metric.ui +++ b/tools/designer/examples/metric/metric.ui @@ -277,7 +277,7 @@ </spacer> <widget class="TQPushButton"> <property name="name"> - <cstring>tquitButton</cstring> + <cstring>quitButton</cstring> </property> <property name="text"> <string>&Quit</string> @@ -295,7 +295,7 @@ <slot>clear()</slot> </connection> <connection> - <sender>tquitButton</sender> + <sender>quitButton</sender> <signal>clicked()</signal> <receiver>ConversionForm</receiver> <slot>close()</slot> @@ -350,7 +350,7 @@ <tabstop>decimalsSpinBox</tabstop> <tabstop>clearButton</tabstop> <tabstop>calculateButton</tabstop> - <tabstop>tquitButton</tabstop> + <tabstop>quitButton</tabstop> </tabstops> <includes> <include location="local" impldecl="in implementation">metric.ui.h</include> diff --git a/tools/designer/examples/multiclip/multiclip.ui b/tools/designer/examples/multiclip/multiclip.ui index 52f83f825..f1312fd9c 100644 --- a/tools/designer/examples/multiclip/multiclip.ui +++ b/tools/designer/examples/multiclip/multiclip.ui @@ -101,7 +101,7 @@ </spacer> <widget class="TQPushButton" row="7" column="1"> <property name="name"> - <cstring>tquitPushButton</cstring> + <cstring>quitPushButton</cstring> </property> <property name="text"> <string>&Quit</string> @@ -163,7 +163,7 @@ </widget> <connections> <connection language="C++"> - <sender>tquitPushButton</sender> + <sender>quitPushButton</sender> <signal>clicked()</signal> <receiver>MulticlipForm</receiver> <slot>accept()</slot> @@ -201,6 +201,6 @@ <tabstop>addPushButton</tabstop> <tabstop>copyPushButton</tabstop> <tabstop>deletePushButton</tabstop> - <tabstop>tquitPushButton</tabstop> + <tabstop>quitPushButton</tabstop> </tabstops> </UI> diff --git a/tools/designer/examples/receiver1/mainform.ui b/tools/designer/examples/receiver1/mainform.ui index c4db74427..3f3326759 100644 --- a/tools/designer/examples/receiver1/mainform.ui +++ b/tools/designer/examples/receiver1/mainform.ui @@ -27,7 +27,7 @@ </property> <widget class="TQPushButton" row="0" column="1"> <property name="name"> - <cstring>tquitPushButton</cstring> + <cstring>quitPushButton</cstring> </property> <property name="text"> <string>&Quit</string> @@ -67,7 +67,7 @@ <slot>creditDialog()</slot> </connection> <connection> - <sender>tquitPushButton</sender> + <sender>quitPushButton</sender> <signal>clicked()</signal> <receiver>MainForm</receiver> <slot>accept()</slot> diff --git a/tools/designer/examples/receiver2/mainform.ui b/tools/designer/examples/receiver2/mainform.ui index b69bca55d..4d52c2812 100644 --- a/tools/designer/examples/receiver2/mainform.ui +++ b/tools/designer/examples/receiver2/mainform.ui @@ -32,7 +32,7 @@ </property> <widget class="TQPushButton" row="0" column="1"> <property name="name"> - <cstring>tquitPushButton</cstring> + <cstring>quitPushButton</cstring> </property> <property name="text"> <string>&Quit</string> @@ -72,7 +72,7 @@ <slot>creditDialog()</slot> </connection> <connection language="C++"> - <sender>tquitPushButton</sender> + <sender>quitPushButton</sender> <signal>clicked()</signal> <receiver>MainForm</receiver> <slot>accept()</slot> diff --git a/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp b/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp index a9ae3b7ed..c412505a9 100644 --- a/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp +++ b/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp @@ -76,7 +76,7 @@ static TQString generateMainCppCode( const TQString &formname, const TQString &i code += " TQApplication a( argc, argv );\n"; code += " " + formname + " w;\n"; code += " w.show();\n"; - code += " a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( tquit() ) );\n"; + code += " a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) );\n"; code += " return a.exec();\n"; code += "}\n"; return code; diff --git a/tools/designer/plugins/glade/glade2ui.cpp b/tools/designer/plugins/glade/glade2ui.cpp index 89337eb58..44965b6e6 100644 --- a/tools/designer/plugins/glade/glade2ui.cpp +++ b/tools/designer/plugins/glade/glade2ui.cpp @@ -447,7 +447,7 @@ static TQString accelerate( const TQString& gtkLabel ) { TQString qtLabel = gtkLabel; qtLabel.replace( '&', TQString("&&") ); - // close but not tquite right + // close but not quite right qtLabel.replace( TQChar('_'), TQChar('&') ); return qtLabel; } diff --git a/tools/designer/uilib/test/main.cpp b/tools/designer/uilib/test/main.cpp index 6cd12eef7..f8ce38c5e 100644 --- a/tools/designer/uilib/test/main.cpp +++ b/tools/designer/uilib/test/main.cpp @@ -45,6 +45,6 @@ int main( int argc, char ** argv ) if ( !w ) return 0; w->show(); - a.connect( &a, SIGNAL(lastWindowClosed()), &a, SLOT(tquit()) ); + a.connect( &a, SIGNAL(lastWindowClosed()), &a, SLOT(quit()) ); return a.exec(); } diff --git a/tools/linguist/book/linguist-programmer.leaf b/tools/linguist/book/linguist-programmer.leaf index d74fdf1fe..1376503b1 100644 --- a/tools/linguist/book/linguist-programmer.leaf +++ b/tools/linguist/book/linguist-programmer.leaf @@ -181,8 +181,8 @@ and Ctrl key accelerators are also translatable: \quotefile tt3/mainwindow.cpp -\skipto tquit() -\printline tquit() +\skipto quit() +\printline quit() \printuntil Quit It is strongly recommended that the two argument form of \c tr() is used @@ -649,8 +649,8 @@ once for the accelerator. \index Ctrl Key \index Alt Key -\skipto tquit() -\printline tquit() +\skipto quit() +\printline quit() \printuntil Ctrl+Q Note the use of \c tr() to support different keys in other languages. @@ -903,8 +903,8 @@ user-visible source texts that must be marked for translation. We must translate the window's caption. -\skipto tquit -\printline tquit +\skipto quit +\printline quit \printuntil Help We also need to translate the menu items. Note that the two argument @@ -991,7 +991,7 @@ these are not correct for the second occurrence of each word, but they provide a good starting point. Change the second "Ativado" into "Ativadas" and the second -"Desativado" into "Desativadas", then save and tquit. Run \l lrelease +"Desativado" into "Desativadas", then save and quit. Run \l lrelease to obtain an up-to-date binary \c tt3_pt.qm file, and run Troll Print (or rather Troll Imprimir). @@ -1103,7 +1103,7 @@ Translate "\<b\>TROLL PRINT\</b\>" as "\<b\>TROLL IMPRIMIR\</b\>". When you're translating "Two-sided", press the \e {Guess Again} button to translate "Two-sided", but change the "2" into "Dois". -Save and tquit, then run \l lrelease. The Portuguese version +Save and quit, then run \l lrelease. The Portuguese version should look like this: \img tt3_11_pt.png diff --git a/tools/linguist/book/linguist-translator.leaf b/tools/linguist/book/linguist-translator.leaf index e20d7921a..16b1c4851 100644 --- a/tools/linguist/book/linguist-translator.leaf +++ b/tools/linguist/book/linguist-translator.leaf @@ -43,7 +43,7 @@ previous translations. Each has a keyboard shortcut, e.g. guess into the Translation area. (Mouse users can double click a phrase or guess to move it into the Translation area.) At the end of the session choose \Menu File|Save from the menu bar and then -\Menu File|Exit to tquit. +\Menu File|Exit to quit. \section1 Qt Linguist's Main Window diff --git a/tools/linguist/tutorial/tt2/mainwindow.cpp b/tools/linguist/tutorial/tt2/mainwindow.cpp index 542846b49..fd381c283 100644 --- a/tools/linguist/tutorial/tt2/mainwindow.cpp +++ b/tools/linguist/tutorial/tt2/mainwindow.cpp @@ -19,7 +19,7 @@ MainWindow::MainWindow( TQWidget *parent, const char *name ) setCentralWidget( ap ); TQPopupMenu *file = new TQPopupMenu( this ); - file->insertItem( tr("E&xit"), qApp, SLOT(tquit()), + file->insertItem( tr("E&xit"), qApp, SLOT(quit()), tr("Ctrl+Q", "Quit") ); menuBar()->insertItem( tr("&File"), file ); menuBar()->setSeparator( TQMenuBar::InWindowsStyle ); diff --git a/tools/linguist/tutorial/tt3/mainwindow.cpp b/tools/linguist/tutorial/tt3/mainwindow.cpp index a0aca2b9e..20edb3fbc 100644 --- a/tools/linguist/tutorial/tt3/mainwindow.cpp +++ b/tools/linguist/tutorial/tt3/mainwindow.cpp @@ -22,7 +22,7 @@ MainWindow::MainWindow( TQWidget *parent, const char *name ) setCentralWidget( pp ); TQPopupMenu *file = new TQPopupMenu( this ); - file->insertItem( tr("E&xit"), qApp, SLOT(tquit()), + file->insertItem( tr("E&xit"), qApp, SLOT(quit()), tr("Ctrl+Q", "Quit") ); TQPopupMenu *help = new TQPopupMenu( this ); help->insertItem( tr("&About"), this, SLOT(about()), Key_F1 ); diff --git a/tools/qconfig/main.cpp b/tools/qconfig/main.cpp index 001fa81f7..b9d66a4d6 100644 --- a/tools/qconfig/main.cpp +++ b/tools/qconfig/main.cpp @@ -306,7 +306,7 @@ Main::Main() file->insertSeparator(); file->insertItem( "&Test all", this, SLOT(testAll()), CTRL+Key_T ); file->insertSeparator(); - file->insertItem( "E&xit", qApp, SLOT(tquit()), CTRL+Key_Q ); + file->insertItem( "E&xit", qApp, SLOT(quit()), CTRL+Key_Q ); menuBar()->insertItem( "&File",file ); diff --git a/tools/qvfb/qvfb.cpp b/tools/qvfb/qvfb.cpp index 3334ca501..ea65f9bb1 100644 --- a/tools/qvfb/qvfb.cpp +++ b/tools/qvfb/qvfb.cpp @@ -135,7 +135,7 @@ void TQVFb::createMenu(TQMenuData *menu) file->insertItem( "&Save image...", this, SLOT(saveImage()), ALT+CTRL+Key_S ); file->insertItem( "&Animation...", this, SLOT(toggleAnimation()), ALT+CTRL+Key_A ); file->insertSeparator(); - file->insertItem( "&Quit", qApp, SLOT(tquit()) ); + file->insertItem( "&Quit", qApp, SLOT(quit()) ); menu->insertItem( "&File", file ); |