1 files changed, 7 insertions, 5 deletions

diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp
index 199f3d6..96822d8 100644
--- a/kaddressbook/nameeditdialog.cpp
+++ b/kaddressbook/nameeditdialog.cpp
@@ -14,30 +14,32 @@
                                                                         
     You should have received a copy of the GNU General Public License   
     along with this program; if not, write to the Free Software         
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                         
     As a special exception, permission is given to link this program    
     with any edition of Qt, and distribute the resulting executable,    
     without including the source code for Qt in the source distribution.
 */                                                                      
 
 #include <qlayout.h>
 #include <qlabel.h>
-#include <qlistbox.h>
-#include <qlistview.h>
+#include <q3listbox.h>
+#include <q3listview.h>
 #include <qtooltip.h>
 #include <qpushbutton.h>
 #include <qcheckbox.h>
 #include <qstring.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 
 #ifndef KAB_EMBEDDED
 #include <kaccelmanager.h>
 #else //KAB_EMBEDDED
 #include <kstandarddirs.h>
 #endif //KAB_EMBEDDED
 
 #include <kapplication.h>
 #include <kbuttonbox.h>
 #include <kconfig.h>
 #include <klineedit.h>
 #include <klistview.h>
@@ -48,25 +50,25 @@
 #include <kiconloader.h>
 #include <kmessagebox.h>
 
 #include "nameeditdialog.h"
 
 NameEditDialog::NameEditDialog( const KABC::Addressee &addr, int type,
                                 QWidget *parent, const char *name )
   : KDialogBase( Plain, i18n( "Edit Contact Name" ), Help | Ok | Cancel,
                  Ok, parent, name, true )
 {
 
   QWidget *page = plainPage();
-  QGridLayout *layout = new QGridLayout( page, 5, 3 );
+  Q3GridLayout *layout = new Q3GridLayout( page, 5, 3 );
   layout->setSpacing( spacingHint() );
   layout->addColSpacing( 2, 100 );
   QLabel *label;
   
   label = new QLabel( i18n( "Honorific prefixes:" ), page );
   layout->addWidget( label, 0, 0 );
   mPrefixCombo = new KComboBox( page );
   mPrefixCombo->setDuplicatesEnabled( false );
   mPrefixCombo->setEditable( true );
   label->setBuddy( mPrefixCombo );
   layout->addMultiCellWidget( mPrefixCombo, 0, 0, 1, 2 );
   
@@ -286,15 +288,15 @@ void NameEditDialog::updateTypeCombo()
   mFormattedNameCombo->setCurrentItem( pos );
 }
 
 void NameEditDialog::slotHelp()
 {
 #ifndef KAB_EMBEDDED
   kapp->invokeHelp( "managing-contacts-automatic-nameparsing" );
 #else //KAB_EMBEDDED
 qDebug("NameEditDialog::slotHelp Help is not supported yet");
 #endif //KAB_EMBEDDED
 }
 
-#ifndef KAB_EMBEDDED
-#include "nameeditdialog.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_nameeditdialog.cpp"
 #endif //KAB_EMBEDDED