2011-03-01 16:02 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

* examples/hbqt_tut/win01.prg * examples/hbqt_tut/win02.prg * examples/hbqt_tut/win02a.prg * examples/hbqt_tut/win03.prg * examples/hbqt_tut/win04.prg * examples/hbqt_tut/win05.prg * examples/hbqt_tut/win06.prg * examples/hbqt_tut/win07.prg * examples/hbqt_tut/win08.prg * examples/hbqt_tut/win09.prg * examples/hbqt_tut/win10.prg * examples/hbqt_tut/win11.prg * examples/hbqt_tut/win12.prg * examples/hbqt_tut/win13.prg * examples/hbqt_tut/win14.prg * examples/hbqt_tut/win15.prg * examples/hbqt_tut/win16.prg * examples/hbqt_tut/win17.prg * examples/hbqt_tut/win18.prg * examples/hbqt_tut/win19.prg * examples/hbqt_tut/win20.prg * examples/hbqt_tut/win21.prg * examples/hbqt_tut/win22.prg * examples/hbqt_tut/win23.prg ! Some small optimization.
2011-03-02 00:06:57 +00:00
parent 47642c4f8f
commit 2fc9f32552
25 changed files with 61 additions and 99 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,33 @@
   The license applies to all entries newer than 2009-04-28.
 */

+2011-03-01 16:02 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
+  * examples/hbqt_tut/win01.prg
+  * examples/hbqt_tut/win02.prg
+  * examples/hbqt_tut/win02a.prg
+  * examples/hbqt_tut/win03.prg
+  * examples/hbqt_tut/win04.prg
+  * examples/hbqt_tut/win05.prg
+  * examples/hbqt_tut/win06.prg
+  * examples/hbqt_tut/win07.prg
+  * examples/hbqt_tut/win08.prg
+  * examples/hbqt_tut/win09.prg
+  * examples/hbqt_tut/win10.prg
+  * examples/hbqt_tut/win11.prg
+  * examples/hbqt_tut/win12.prg
+  * examples/hbqt_tut/win13.prg
+  * examples/hbqt_tut/win14.prg
+  * examples/hbqt_tut/win15.prg
+  * examples/hbqt_tut/win16.prg
+  * examples/hbqt_tut/win17.prg
+  * examples/hbqt_tut/win18.prg
+  * examples/hbqt_tut/win19.prg
+  * examples/hbqt_tut/win20.prg
+  * examples/hbqt_tut/win21.prg
+  * examples/hbqt_tut/win22.prg
+  * examples/hbqt_tut/win23.prg
+    ! Some small optimization.
+
 2011-03-01 13:54 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
  * contrib/hbxbp/xbptreeview.prg
    ! Added missing elements on return values of two methods.
--- a/harbour/examples/hbqt_tut/win01.prg
+++ b/harbour/examples/hbqt_tut/win01.prg
@@ -2,16 +2,13 @@

 PROCEDURE Main()

-   LOCAL s_qApp
   LOCAL oWnd

-   s_qApp := QApplication()
-
   oWnd := QMainWindow()
   oWnd:setWindowTitle( "Finestra di Giovanni" )
   oWnd:resize( 300, 200 )

   oWnd:show()
-   s_qApp:exec()
+   QApplication():exec()

   RETURN
--- a/harbour/examples/hbqt_tut/win02.prg
+++ b/harbour/examples/hbqt_tut/win02.prg
@@ -2,12 +2,9 @@

 PROCEDURE Main()

-   LOCAL s_qApp
   LOCAL oWnd
   LOCAL calendario

-   s_qApp := QApplication()
-
   oWnd := QMainWindow()
   oWnd:setWindowTitle( "Finestra di Giovanni" )
   oWnd:resize( 400, 300 )
@@ -19,6 +16,6 @@ PROCEDURE Main()
   calendario:setGridVisible( .T. )

   oWnd:show()
-   s_qApp:exec()
+   QApplication():exec()

   RETURN
--- a/harbour/examples/hbqt_tut/win02a.prg
+++ b/harbour/examples/hbqt_tut/win02a.prg
@@ -2,12 +2,9 @@

 PROCEDURE Main()

-   LOCAL s_qApp
   LOCAL oWnd
   LOCAL testo

-   s_qApp := QApplication()
-
   oWnd := QMainWindow()
   oWnd:setWindowTitle( "Finestra di Giovanni" )
   oWnd:resize( 300, 200 )
@@ -17,6 +14,6 @@ PROCEDURE Main()
   testo:move( 100, 100 )

   oWnd:show()
-   s_qApp:exec()
+   QApplication():exec()

   RETURN
--- a/harbour/examples/hbqt_tut/win03.prg
+++ b/harbour/examples/hbqt_tut/win03.prg
@@ -2,12 +2,9 @@

 PROCEDURE Main()

-   LOCAL s_qApp
   LOCAL oWnd
   LOCAL pulsante1

-   s_qApp := QApplication()
-
   oWnd := QMainWindow()
   oWnd:setWindowTitle( "Finestra di Giovanni" )
   oWnd:resize( 400, 300 )
@@ -19,7 +16,7 @@ PROCEDURE Main()
   Pulsante1:Connect( "clicked()", { || messaggio() } )

   oWnd:show()
-   s_qApp:exec()
+   QApplication():exec()

   RETURN

--- a/harbour/examples/hbqt_tut/win04.prg
+++ b/harbour/examples/hbqt_tut/win04.prg
@@ -3,11 +3,8 @@ STATIC oWnd

 PROCEDURE Main()

-   LOCAL s_qApp
   LOCAL Pulsante1, Pulsante2

-   s_qApp := QApplication()
-
   oWnd := QMainWindow()
   oWnd:setWindowTitle( "Prova dei pulsanti" )
   oWnd:resize( 640, 480 )
@@ -15,7 +12,7 @@ PROCEDURE Main()
   Pulsante1 := QPushButton( oWnd )
   Pulsante1:setText( "Quit" )
   Pulsante1:move( 50, 50 )
-   Pulsante1:Connect( "clicked()", { || s_qApp:quit() } )
+   Pulsante1:Connect( "clicked()", { || QApplication():quit() } )

   Pulsante2 := QPushButton( oWnd )
   Pulsante2:setText( "Premere per modificare la barra del titolo" )
@@ -25,7 +22,7 @@ PROCEDURE Main()
   Pulsante2:Connect( "clicked()", { || modifica() } )

   oWnd:show()
-   s_qApp:exec()
+   QApplication():exec()

   RETURN

--- a/harbour/examples/hbqt_tut/win05.prg
+++ b/harbour/examples/hbqt_tut/win05.prg
@@ -2,12 +2,9 @@

 PROCEDURE Main()

-   LOCAL s_qApp
   LOCAL oWnd
   LOCAL oSBar

-   s_qApp := QApplication()
-
   oWnd := QMainWindow()
   oWnd:show()

@@ -19,6 +16,6 @@ PROCEDURE Main()

   oSBar:showMessage( "Harbour-QT Statusbar Ready!" )

-   s_qApp:exec()
+   QApplication():exec()

   RETURN
--- a/harbour/examples/hbqt_tut/win06.prg
+++ b/harbour/examples/hbqt_tut/win06.prg
@@ -2,13 +2,10 @@

 PROCEDURE Main()

-   LOCAL s_qApp
   LOCAL oWnd
   LOCAL barra_schede
   LOCAL clienti, fornitori, magazzino

-   s_qApp := QApplication()
-
   oWnd := QMainWindow()
   oWnd:setWindowTitle( "Finestra di Giovanni" )
   oWnd:resize( 500, 300 )
@@ -26,6 +23,6 @@ PROCEDURE Main()
   barra_schede:addTab( magazzino, "Scheda Magazzino" )

   oWnd:show()
-   s_qApp:exec()
+   QApplication():exec()

   RETURN
--- a/harbour/examples/hbqt_tut/win07.prg
+++ b/harbour/examples/hbqt_tut/win07.prg
@@ -3,11 +3,9 @@ STATIC testo

 PROCEDURE Main()

-   LOCAL s_qApp
   LOCAL oWnd
   LOCAL orolo

-   s_qApp := QApplication()
   oWnd := QMainWindow()
   oWnd:setWindowTitle( "Finestra di Giovanni" )
   oWnd:resize( 250, 150 )
@@ -20,7 +18,7 @@ PROCEDURE Main()
   orolo:Connect( "timeout()", { || stampa_orologio() } )
   orolo:start( 1000 )
   oWnd:show()
-   s_qApp:exec()
+   QApplication():exec()

   RETURN

--- a/harbour/examples/hbqt_tut/win08.prg
+++ b/harbour/examples/hbqt_tut/win08.prg
@@ -4,11 +4,9 @@ STATIC orolo

 PROCEDURE Main()

-   LOCAL s_qApp
   LOCAL oWnd
   LOCAL pulsante_start, pulsante_stop

-   s_qApp := QApplication()
   oWnd := QMainWindow()
   oWnd:setWindowTitle( "Finestra di Giovanni" )
   oWnd:resize( 300, 200 )
@@ -27,7 +25,7 @@ PROCEDURE Main()
   pulsante_stop:setText( "Stop" )
   pulsante_stop:connect( "pressed()", { || stop() } )
   oWnd:show()
-   s_qApp:exec()
+   QApplication():exec()

   RETURN

--- a/harbour/examples/hbqt_tut/win09.prg
+++ b/harbour/examples/hbqt_tut/win09.prg
@@ -2,12 +2,9 @@

 PROCEDURE Main()

-   LOCA s_qApp
   LOCAL oWnd
   LOCAL Pulsante1

-   s_qApp := QApplication()
-
   oWnd := QMainWindow()
   oWnd:setWindowTitle( "Prova dei pulsanti" )
   oWnd:resize( 300, 200 )
@@ -15,10 +12,10 @@ PROCEDURE Main()
   Pulsante1 := QPushButton( oWnd )
   Pulsante1:setText( "Quit" )
   Pulsante1:move( 50, 50 )
-   Pulsante1:Connect( "clicked()", { || s_qApp:quit() } )
+   Pulsante1:Connect( "clicked()", { || QApplication():quit() } )
   Pulsante1:setStyleSheet( "background-color: yellow; border: 2px solid # FF0000;")

   oWnd:show()
-   s_qApp:exec()
+   QApplication():exec()

   RETURN
--- a/harbour/examples/hbqt_tut/win10.prg
+++ b/harbour/examples/hbqt_tut/win10.prg
@@ -2,12 +2,9 @@

 PROCEDURE Main()

-   LOCAL qApp
   LOCAL finestra
   LOCAL oMenuBar, oMenu1, oVoceIns, oVoceMod

-   qApp := QApplication()
-
   // ----------Impostazione Finestra-----------
   finestra := QmainWindow()
   finestra:SetFixedSize( 300, 200 )
@@ -33,7 +30,7 @@ PROCEDURE Main()
   oMenuBar:addMenu( oMenu1 )

   finestra:Show()
-   qApp:exec()
+   QApplication():exec()

   RETURN

--- a/harbour/examples/hbqt_tut/win11.prg
+++ b/harbour/examples/hbqt_tut/win11.prg
@@ -2,9 +2,8 @@

 PROCEDURE Main()

-   LOCAL applicazione, finestra, ui, file
+   LOCAL finestra, ui, file

-   applicazione := QApplication()
   file := QFile( "prova.ui" )
   file:open( 1 )
   ui := QUiLoader()
@@ -13,7 +12,6 @@ PROCEDURE Main()
   file:close()
   finestra:show()

-   applicazione:exec()
-   applicazione:quit()
+   QApplication():exec()

   RETURN
--- a/harbour/examples/hbqt_tut/win12.prg
+++ b/harbour/examples/hbqt_tut/win12.prg
@@ -4,12 +4,12 @@ STATIC tabella
 PROCEDURE Main()

   //------------Dichiarazioni--------------
-   LOCAL applicazione, finestra
+   LOCAL finestra
   LOCAL cella, valore
   LOCAL num_campi, num_record, intestazioni
   LOCAL x, y
   LOCAL pulsante_primo, pulsante_ultimo
-   applicazione := QApplication()
+
   finestra := QMainWindow()
   finestra:resize( 800, 600 )
   //------------Apre DBF e conta campi e record------------
@@ -61,8 +61,7 @@ PROCEDURE Main()
   pulsante_ultimo:Connect( "clicked()", { || ultimo() } )
   //------------Esecuzione--------------
   finestra:show()
-   applicazione:exec()
-   applicazione:quit()
+   QApplication():exec()

   RETURN

--- a/harbour/examples/hbqt_tut/win13.prg
+++ b/harbour/examples/hbqt_tut/win13.prg
@@ -2,12 +2,10 @@

 PROCEDURE Main()

-   LOCAL s_qApp
   LOCAL oWnd
   LOCAL stringa
   LOCAL dialogo

-   s_qApp := QApplication()
   oWnd := QMainWindow()
   oWnd:setWindowTitle( "Finestra di Giovanni" )
   oWnd:resize( 400, 300 )
@@ -18,6 +16,6 @@ PROCEDURE Main()
   stringa = dialogo:getText( oWnd, "Titolo", "Come ti chiami?" )
   oWnd:setWindowTitle( stringa )

-   s_qApp:exec()
+   QApplication():exec()

   RETURN
--- a/harbour/examples/hbqt_tut/win14.prg
+++ b/harbour/examples/hbqt_tut/win14.prg
@@ -2,12 +2,9 @@

 PROCEDURE Main()

-   LOCAL s_qApp
   LOCAL barra_progresso
   LOCAL k

-   s_qApp := QApplication()
-
   barra_progresso := QProgressBar()
   barra_progresso:resize( 400, 50 )
   barra_progresso:move( 50, 50 )
@@ -21,6 +18,6 @@ PROCEDURE Main()
   next k

   barra_progresso:quit()
-   s_qApp:exec()
+   QApplication():exec()

   RETURN
--- a/harbour/examples/hbqt_tut/win15.prg
+++ b/harbour/examples/hbqt_tut/win15.prg
@@ -2,12 +2,9 @@

 PROCEDURE Main()

-   LOCAL s_qApp
   LOCAL finestra
   LOCAL logo

-   s_qApp := QApplication()
-
   finestra := QmainWindow()
   finestra:SetFixedSize( 400, 300 )
   finestra:setWindowTitle( "Finestra Giovanni" )
@@ -20,6 +17,6 @@ PROCEDURE Main()

   finestra:show()

-   s_qApp:exec()
+   QApplication():exec()

   RETURN
--- a/harbour/examples/hbqt_tut/win16.prg
+++ b/harbour/examples/hbqt_tut/win16.prg
@@ -2,12 +2,9 @@

 PROCEDURE Main()

-   LOCAL s_qApp
   LOCAL oWnd
   LOCAL testo

-   s_qApp := QApplication()
-
   oWnd := QMainWindow()
   oWnd:setWindowTitle( "Finestra di Giovanni" )
   oWnd:resize( 300, 200 )
@@ -18,6 +15,6 @@ PROCEDURE Main()
   testo:resize( 280, 100 )

   oWnd:show()
-   s_qApp:exec()
+   QApplication():exec()

   RETURN
--- a/harbour/examples/hbqt_tut/win17.prg
+++ b/harbour/examples/hbqt_tut/win17.prg
@@ -5,12 +5,9 @@ STATIC testo

 PROCEDURE Main()

-   LOCAL s_qApp
   LOCAL finestra
   LOCAL font

-   s_qApp := QApplication()
-
   finestra := QMainWindow()
   finestra:resize( 320, 400 )
   finestra:setWindowTitle( "Giovanni" )
@@ -57,7 +54,7 @@ PROCEDURE Main()

   finestra:show()

-   s_qApp:exec()
+   QApplication():exec()

   RETURN

--- a/harbour/examples/hbqt_tut/win18.prg
+++ b/harbour/examples/hbqt_tut/win18.prg
@@ -5,11 +5,8 @@ STATIC modificatore

 PROCEDURE Main()

-   LOCAL s_qApp
   LOCAL finestra

-   s_qApp := QApplication()
-
   finestra := QMainWindow()
   finestra:resize( 320, 200 )
   finestra:setWindowTitle( "Giovanni" )
@@ -33,7 +30,7 @@ PROCEDURE Main()

   finestra:show()

-   s_qApp:exec()
+   QApplication():exec()

   RETURN

--- a/harbour/examples/hbqt_tut/win19.prg
+++ b/harbour/examples/hbqt_tut/win19.prg
@@ -2,12 +2,9 @@

 PROCEDURE Main()

-   LOCAL s_qApp
   LOCAL finestra
   LOCAL casella

-   s_qApp := QApplication()
-
   finestra := QMainWindow()
   finestra:resize( 320, 200 )
   finestra:setWindowTitle( "Giovanni" )
@@ -26,6 +23,6 @@ PROCEDURE Main()

   finestra:show()

-   s_qApp:exec()
+   QApplication():exec()

   RETURN
--- a/harbour/examples/hbqt_tut/win20.prg
+++ b/harbour/examples/hbqt_tut/win20.prg
@@ -4,12 +4,9 @@ STATIC casella

 PROCEDURE Main()

-   LOCAL s_qApp
   LOCAL finestra
   LOCAL font

-   s_qApp := QApplication()
-
   finestra := QMainWindow()
   finestra:resize( 320, 200 )
   finestra:setWindowTitle( "Giovanni" )
@@ -29,7 +26,7 @@ PROCEDURE Main()

   finestra:show()

-   s_qApp:exec()
+   QApplication():exec()

   RETURN

--- a/harbour/examples/hbqt_tut/win21.prg
+++ b/harbour/examples/hbqt_tut/win21.prg
@@ -1,11 +1,9 @@
 #include "hbqtgui.ch"
-STATIC lcd

 PROCEDURE Main()

-   LOCAL s_qApp, finestra, pulsante_diminuisci, pulsante_aumenta
+   LOCAL finestra, pulsante_diminuisci, pulsante_aumenta, lcd

-   s_qApp := QApplication()
   finestra := QMainWindow()
   finestra:resize( 300, 200 )
   finestra:setWindowTitle( "Giovanni" )
@@ -16,18 +14,18 @@ PROCEDURE Main()
   pulsante_diminuisci:resize( 30, 30 )
   pulsante_diminuisci:move( 70, 130 )
   pulsante_diminuisci:setText( "-" )
-   pulsante_diminuisci:Connect( "clicked()", { || decrementa() } )
+   pulsante_diminuisci:Connect( "clicked()", { || decrementa( lcd ) } )
   pulsante_aumenta := QPushButton( finestra )
   pulsante_aumenta:resize( 30, 30 )
   pulsante_aumenta:move( 200, 130 )
   pulsante_aumenta:setText( "+" )
-   pulsante_aumenta:Connect( "clicked()", { || incrementa() } )
+   pulsante_aumenta:Connect( "clicked()", { || incrementa( lcd ) } )
   finestra:show()
-   s_qApp:exec()
+   QApplication():exec()

   RETURN

-PROCEDURE incrementa()
+PROCEDURE incrementa( lcd )

   LOCAL x

@@ -37,7 +35,7 @@ PROCEDURE incrementa()

   RETURN

-PROCEDURE decrementa()
+PROCEDURE decrementa( lcd )

   LOCAL x

--- a/harbour/examples/hbqt_tut/win22.prg
+++ b/harbour/examples/hbqt_tut/win22.prg
@@ -3,15 +3,12 @@ STATIC edit1, edit2, edit3

 PROCEDURE Main()

-   LOCAL s_qApp
   LOCAL finestra
   LOCAL testo
   LOCAL calcola

   SET DATE ITALIAN

-   s_qApp := QApplication()
-
   finestra := QMainWindow()
   finestra:resize( 400, 300 )
   finestra:setWindowTitle( "Giovanni" )
@@ -40,7 +37,7 @@ PROCEDURE Main()

   finestra:show()

-   s_qApp:exec()
+   QApplication():exec()

   RETURN

--- a/harbour/examples/hbqt_tut/win23.prg
+++ b/harbour/examples/hbqt_tut/win23.prg
@@ -2,12 +2,9 @@

 PROCEDURE Main()

-   LOCAL s_qApp
   LOCAL finestra
   LOCAL bottone1, bottone2, bottone3

-   s_qApp := QApplication()
-
   finestra := QMainWindow()
   finestra:resize( 400, 300 )
   finestra:setWindowTitle( "Giovanni" )
@@ -28,7 +25,7 @@ PROCEDURE Main()
   bottone3:Connect( "clicked()", { || messaggio( "NON SO" ) } )

   finestra:show()
-   s_qApp:exec()
+   QApplication():exec()

   RETURN