1.1 --- a/findwindow.cpp	Sun Jan 30 12:58:47 2005 +0000
     1.2 +++ b/findwindow.cpp	Tue Jun 06 14:58:11 2006 +0000
     1.3 @@ -1,21 +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, WFlags f) 
    1.15 -	: QGroupBox( 0, Horizontal, "Find", parent, name )
    1.16 +FindWindow::FindWindow(QWidget* parent, const char* name) 
    1.17 +	: Q3GroupBox( 0, Qt::Horizontal, "Find", parent, name )
    1.18  
    1.19  {
    1.20 -	setCaption ("VYM - Find Text");
    1.21 +	setCaption (__VYM " - " +tr("Find Text"));
    1.22  	//resize (180,130);
    1.23  	move (130,130);
    1.24  
    1.25 -	setMargin( 100 );
    1.26 +	//FIXME not avail in QT4 setMargin( 100 );
    1.27  
    1.28 -    QVBoxLayout* box = new QVBoxLayout( layout() );
    1.29 +    Q3VBoxLayout* box = new Q3VBoxLayout( layout() );
    1.30      
    1.31 -    QHBoxLayout *row1 = new QHBoxLayout( box );
    1.32 +    Q3HBoxLayout *row1 = new Q3HBoxLayout( box );
    1.33      row1->setMargin( 10 );
    1.34  
    1.35      // Create a Label
    1.36 @@ -23,7 +28,7 @@
    1.37      row1->addWidget( label );
    1.38  
    1.39  	// Create LineEdit (here QComboBox)
    1.40 -    QHBoxLayout *row2 = new QHBoxLayout( box );
    1.41 +    Q3HBoxLayout *row2 = new Q3HBoxLayout( box );
    1.42      row2->setMargin( 10 );
    1.43      findcombo = new QComboBox( true, this );
    1.44  	findcombo->setMinimumWidth(150);
    1.45 @@ -35,7 +40,7 @@
    1.46      //findcombo->insertItem( "Normal", -1 );
    1.47  
    1.48  	// Create Buttons
    1.49 -    QHBoxLayout *row3 = new QHBoxLayout( box );
    1.50 +    Q3HBoxLayout *row3 = new Q3HBoxLayout( box );
    1.51      row3->setMargin( 10 );
    1.52  	clearbutton = new QPushButton (tr("Clear"),this);
    1.53  	connect ( clearbutton, SIGNAL( clicked() ), 
    1.54 @@ -46,7 +51,7 @@
    1.55  	row3->addItem(si1);
    1.56  	
    1.57  	cancelbutton = new QPushButton (tr("Cancel"),this);
    1.58 -	cancelbutton->setAccel (Key_Escape);
    1.59 +	cancelbutton->setAccel (Qt::Key_Escape);
    1.60  	connect ( cancelbutton, SIGNAL( clicked() ), 
    1.61  		this, SLOT( cancelPressed() ) );
    1.62  	row3->addWidget (cancelbutton);