1.1 --- a/findwindow.cpp	Tue Jan 24 15:09:48 2006 +0000
     1.2 +++ b/findwindow.cpp	Tue Sep 05 09:47:13 2006 +0000
     1.3 @@ -1,22 +1,26 @@
     1.4  #include <qlineedit.h>
     1.5 +//Added by qt3to4:
     1.6 +#include <Q3HBoxLayout>
     1.7 +#include <Q3VBoxLayout>
     1.8 +#include <QLabel>
     1.9  
    1.10  #include "findwindow.h"
    1.11  #include "version.h"
    1.12  
    1.13  
    1.14  FindWindow::FindWindow(QWidget* parent, const char* name) 
    1.15 -	: QGroupBox( 0, Horizontal, "Find", parent, name )
    1.16 +	: Q3GroupBox( 0, Qt::Horizontal, "Find", parent, name )
    1.17  
    1.18  {
    1.19  	setCaption (__VYM " - " +tr("Find Text"));
    1.20  	//resize (180,130);
    1.21  	move (130,130);
    1.22  
    1.23 -	setMargin( 100 );
    1.24 +	//FIXME not avail in QT4 setMargin( 100 );
    1.25  
    1.26 -    QVBoxLayout* box = new QVBoxLayout( layout() );
    1.27 +    Q3VBoxLayout* box = new Q3VBoxLayout( layout() );
    1.28      
    1.29 -    QHBoxLayout *row1 = new QHBoxLayout( box );
    1.30 +    Q3HBoxLayout *row1 = new Q3HBoxLayout( box );
    1.31      row1->setMargin( 10 );
    1.32  
    1.33      // Create a Label
    1.34 @@ -24,7 +28,7 @@
    1.35      row1->addWidget( label );
    1.36  
    1.37  	// Create LineEdit (here QComboBox)
    1.38 -    QHBoxLayout *row2 = new QHBoxLayout( box );
    1.39 +    Q3HBoxLayout *row2 = new Q3HBoxLayout( box );
    1.40      row2->setMargin( 10 );
    1.41      findcombo = new QComboBox( true, this );
    1.42  	findcombo->setMinimumWidth(150);
    1.43 @@ -36,7 +40,7 @@
    1.44      //findcombo->insertItem( "Normal", -1 );
    1.45  
    1.46  	// Create Buttons
    1.47 -    QHBoxLayout *row3 = new QHBoxLayout( box );
    1.48 +    Q3HBoxLayout *row3 = new Q3HBoxLayout( box );
    1.49      row3->setMargin( 10 );
    1.50  	clearbutton = new QPushButton (tr("Clear"),this);
    1.51  	connect ( clearbutton, SIGNAL( clicked() ), 
    1.52 @@ -47,7 +51,7 @@
    1.53  	row3->addItem(si1);
    1.54  	
    1.55  	cancelbutton = new QPushButton (tr("Cancel"),this);
    1.56 -	cancelbutton->setAccel (Key_Escape);
    1.57 +	cancelbutton->setAccel (Qt::Key_Escape);
    1.58  	connect ( cancelbutton, SIGNAL( clicked() ), 
    1.59  		this, SLOT( cancelPressed() ) );
    1.60  	row3->addWidget (cancelbutton);