1 files changed, 15 insertions, 13 deletions

diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp
index c117d34..8ebee19 100644
--- a/kaddressbook/keywidget.cpp
+++ b/kaddressbook/keywidget.cpp
@@ -30,2 +30,4 @@
 #include <qpushbutton.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 
@@ -38,3 +40,3 @@
 #include <qmessagebox.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <kurl.h>
@@ -54,3 +56,3 @@ KeyWidget::KeyWidget( QWidget *parent, const char *name )
 {
-  QGridLayout *layout = new QGridLayout( this, 2, 2, KDialog::marginHint(),
+  Q3GridLayout *layout = new Q3GridLayout( this, 2, 2, KDialog::marginHint(),
                                          KDialog::spacingHint() );
@@ -138,3 +140,3 @@ void KeyWidget::addKey()
     QFile file( tmpFile );
-    if ( !file.open( IO_ReadOnly ) ) {
+    if ( !file.open( QIODevice::ReadOnly ) ) {
       QString text( i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ) );
@@ -154,3 +156,3 @@ void KeyWidget::addKey()
     QFile file( keyfile );
-    if ( !file.open( IO_ReadOnly ) ) {
+    if ( !file.open( QIODevice::ReadOnly ) ) {
       QString text( i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ) );
@@ -165,6 +167,6 @@ void KeyWidget::addKey()
 
-    QTextStream s( &file );
+    Q3TextStream s( &file );
     QString data;
 
-    s.setEncoding( QTextStream::UnicodeUTF8 );
+    s.setEncoding( Q3TextStream::UnicodeUTF8 );
     s >> data;
@@ -223,4 +225,4 @@ void KeyWidget::exportKey()
   KTempFile tempFile;
-  QTextStream *s = tempFile.textStream();
-  s->setEncoding( QTextStream::UnicodeUTF8 );
+  Q3TextStream *s = tempFile.textStream();
+  s->setEncoding( Q3TextStream::UnicodeUTF8 );
   (*s) << key.textData();
@@ -237,3 +239,3 @@ void KeyWidget::exportKey()
   QFile file( keyfile );
-    if ( !file.open( IO_ReadWrite ) ) {
+    if ( !file.open( QIODevice::ReadWrite ) ) {
       QString text( i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ) );
@@ -244,4 +246,4 @@ void KeyWidget::exportKey()
 
-  QTextStream s( &file );
-  s.setEncoding( QTextStream::UnicodeUTF8 );
+  Q3TextStream s( &file );
+  s.setEncoding( Q3TextStream::UnicodeUTF8 );
   s << key.textData();
@@ -274,4 +276,4 @@ void KeyWidget::updateKeyCombo()
 
-#ifndef KAB_EMBEDDED
-#include "keywidget.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_keywidget.cpp"
 #endif //KAB_EMBEDDED