initial public commit of qt4 portp1

1 files changed, 23 insertions, 16 deletions

diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index 5269af7..2814c61 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -28,6 +28,6 @@
 #include <qlayout.h>
-#include <qvbox.h>
+#include <q3vbox.h>
 #include <qfile.h>
 #include <qdir.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qtextcodec.h>
@@ -36,2 +36,9 @@
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <Q3Frame>
+#include <QKeyEvent>
+#include <QEvent>
+#include <Q3VBoxLayout>
 
@@ -59,3 +66,3 @@
 JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
-  QFrame(parent)
+  Q3Frame(parent)
 {
@@ -72,3 +79,3 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
   visibleMode = true;
-  QHBox * vb = new QHBox ( this );
+  Q3HBox * vb = new Q3HBox ( this );
   QPixmap iconp;
@@ -131,3 +138,3 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
   mEditor->setWordWrap( KTextEdit::WidgetWidth );
-  QBoxLayout *topLayout = new QVBoxLayout(this);
+  Q3BoxLayout *topLayout = new Q3VBoxLayout(this);
   topLayout->addWidget(vb);
@@ -137,3 +144,3 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
   mTitle->installEventFilter(this);
-  setFocusPolicy (QWidget::NoFocus); 
+  setFocusPolicy (Qt::NoFocus); 
 
@@ -170,3 +177,3 @@ void JournalEntry::resizeEvent(QResizeEvent* e )
 #endif
-    QFrame::resizeEvent( e ); 
+    Q3Frame::resizeEvent( e ); 
 }
@@ -188,3 +195,3 @@ void JournalEntry::slotSaveTemplate()
     QFile fileIn( fileName );
-    if (!fileIn.open( IO_WriteOnly ) ) {
+    if (!fileIn.open( QIODevice::WriteOnly ) ) {
         KMessageBox::error( this, i18n("Error saving template file\n '%1'.")
@@ -194,3 +201,3 @@ void JournalEntry::slotSaveTemplate()
     // QString text;
-    QTextStream tsIn( &fileIn );
+    Q3TextStream tsIn( &fileIn );
     tsIn.setCodec( QTextCodec::codecForName("utf8") );
@@ -210,3 +217,3 @@ void JournalEntry::slotLoadTemplate()
     QFile fileIn( fileName );
-    if (!fileIn.open( IO_ReadOnly ) ) {
+    if (!fileIn.open( QIODevice::ReadOnly ) ) {
         KMessageBox::error( this, i18n("Error loading template file\n '%1'.")
@@ -215,3 +222,3 @@ void JournalEntry::slotLoadTemplate()
     }
-    QTextStream tsIn( &fileIn );
+    Q3TextStream tsIn( &fileIn );
     tsIn.setCodec( QTextCodec::codecForName("utf8") );
@@ -318,7 +325,7 @@ bool JournalEntry::eventFilter( QObject *o, QEvent *e )
     if ( isVisible() ) {
-        mEditor->setFocusPolicy (QWidget::StrongFocus); 
-        mTitle->setFocusPolicy (QWidget::StrongFocus); 
+        mEditor->setFocusPolicy (Qt::StrongFocus); 
+        mTitle->setFocusPolicy (Qt::StrongFocus); 
     } else {
-        mEditor->setFocusPolicy (QWidget::NoFocus); 
-        mTitle->setFocusPolicy (QWidget::NoFocus); 
+        mEditor->setFocusPolicy (Qt::NoFocus); 
+        mTitle->setFocusPolicy (Qt::NoFocus); 
     }
@@ -337,3 +344,3 @@ bool JournalEntry::eventFilter( QObject *o, QEvent *e )
 
-  return QFrame::eventFilter( o, e );    // standard event processing
+  return Q3Frame::eventFilter( o, e );    // standard event processing
 }