author | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
commit | a08aff328d4393031d5ba7d622c2b05705a89d73 (patch) (unidiff) | |
tree | 8ee90d686081c52e7c69b5ce946e9b1a7d690001 /microkde/kapplication.cpp | |
parent | 11edc920afe4f274c0964436633aa632c8288a40 (diff) | |
download | kdepimpi-p1.zip kdepimpi-p1.tar.gz kdepimpi-p1.tar.bz2 |
initial public commit of qt4 portp1
-rw-r--r-- | microkde/kapplication.cpp | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/microkde/kapplication.cpp b/microkde/kapplication.cpp index d7c12bb..b058d54 100644 --- a/microkde/kapplication.cpp +++ b/microkde/kapplication.cpp | |||
@@ -8,7 +8,10 @@ | |||
8 | #include <qfile.h> | 8 | #include <qfile.h> |
9 | #include <qtextstream.h> | 9 | #include <q3textstream.h> |
10 | #include <qdialog.h> | 10 | #include <qdialog.h> |
11 | #include <qlayout.h> | 11 | #include <qlayout.h> |
12 | #include <qtextbrowser.h> | 12 | #include <q3textbrowser.h> |
13 | #include <qregexp.h> | 13 | #include <qregexp.h> |
14 | #include <QDesktopWidget> | ||
15 | //Added by qt3to4: | ||
16 | #include <Q3VBoxLayout> | ||
14 | 17 | ||
@@ -77,6 +80,6 @@ void KApplication::showFile(QString caption, QString fn) | |||
77 | QFile file( fileName ); | 80 | QFile file( fileName ); |
78 | if (!file.open( IO_ReadOnly ) ) { | 81 | if (!file.open( QIODevice::ReadOnly ) ) { |
79 | return ; | 82 | return ; |
80 | } | 83 | } |
81 | QTextStream ts( &file ); | 84 | Q3TextStream ts( &file ); |
82 | text = ts.read(); | 85 | text = ts.read(); |
@@ -91,3 +94,3 @@ bool KApplication::convert2latin1(QString fileName) | |||
91 | QFile file( fileName ); | 94 | QFile file( fileName ); |
92 | if (!file.open( IO_ReadOnly ) ) { | 95 | if (!file.open( QIODevice::ReadOnly ) ) { |
93 | return false; | 96 | return false; |
@@ -95,11 +98,11 @@ bool KApplication::convert2latin1(QString fileName) | |||
95 | } | 98 | } |
96 | QTextStream ts( &file ); | 99 | Q3TextStream ts( &file ); |
97 | ts.setEncoding( QTextStream::UnicodeUTF8 ); | 100 | ts.setEncoding( Q3TextStream::UnicodeUTF8 ); |
98 | text = ts.read(); | 101 | text = ts.read(); |
99 | file.close(); | 102 | file.close(); |
100 | if (!file.open( IO_WriteOnly ) ) { | 103 | if (!file.open( QIODevice::WriteOnly ) ) { |
101 | return false; | 104 | return false; |
102 | } | 105 | } |
103 | QTextStream tsIn( &file ); | 106 | Q3TextStream tsIn( &file ); |
104 | tsIn.setEncoding( QTextStream::Latin1 ); | 107 | tsIn.setEncoding( Q3TextStream::Latin1 ); |
105 | tsIn << text.latin1(); | 108 | tsIn << text.latin1(); |
@@ -114,3 +117,3 @@ void KApplication::showText(QString caption, QString text) | |||
114 | dia.setCaption( caption ); | 117 | dia.setCaption( caption ); |
115 | QVBoxLayout* lay = new QVBoxLayout( &dia ); | 118 | Q3VBoxLayout* lay = new Q3VBoxLayout( &dia ); |
116 | lay->setSpacing( 3 ); | 119 | lay->setSpacing( 3 ); |
@@ -118,3 +121,3 @@ void KApplication::showText(QString caption, QString text) | |||
118 | KTextEdit tb ( &dia ); | 121 | KTextEdit tb ( &dia ); |
119 | tb.setWordWrap( QMultiLineEdit::WidgetWidth ); | 122 | tb.setWordWrap( Q3MultiLineEdit::WidgetWidth ); |
120 | lay->addWidget( &tb ); | 123 | lay->addWidget( &tb ); |
@@ -135,3 +138,3 @@ void KApplication::showText(QString caption, QString text) | |||
135 | #include <qradiobutton.h> | 138 | #include <qradiobutton.h> |
136 | #include <qbuttongroup.h> | 139 | #include <q3buttongroup.h> |
137 | #include "kglobal.h" | 140 | #include "kglobal.h" |
@@ -146,3 +149,3 @@ class KBackupPrefs : public QDialog | |||
146 | setCaption( i18n("Backup Failed!") ); | 149 | setCaption( i18n("Backup Failed!") ); |
147 | QVBoxLayout* lay = new QVBoxLayout( this ); | 150 | Q3VBoxLayout* lay = new Q3VBoxLayout( this ); |
148 | lay->setSpacing( 3 ); | 151 | lay->setSpacing( 3 ); |
@@ -151,3 +154,3 @@ class KBackupPrefs : public QDialog | |||
151 | lay->addWidget( lab ); | 154 | lay->addWidget( lab ); |
152 | QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("Choose action"), this ); | 155 | Q3ButtonGroup* format = new Q3ButtonGroup( 1, Qt::Horizontal, i18n("Choose action"), this ); |
153 | lay->addWidget( format ); | 156 | lay->addWidget( format ); |