[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdepim
From: Tom Albers <tomalbers () kde ! nl>
Date: 2007-06-27 18:49:58
Message-ID: 1182970198.038885.5408.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 681024 by toma:
kfileio has moved from libkdepim to kdepimlibs.
M +2 -2 akregator/src/articleviewer.cpp
M +2 -2 kmail/kmcommands.cpp
M +3 -3 kmail/kmcomposewin.cpp
M +2 -2 kmail/kmedit.cpp
M +6 -6 kmail/kmfilteraction.cpp
M +2 -2 kmail/kmfoldermaildir.cpp
M +4 -4 kmail/kmkernel.cpp
M +4 -4 kmail/kmreaderwin.cpp
M +0 -1 kmail/objecttreeparser.cpp
M +2 -2 knode/articlewidget.cpp
M +2 -2 kontact/src/mainwindow.cpp
M +0 -1 libkdepim/CMakeLists.txt
D libkdepim/kfileio.cpp
D libkdepim/kfileio.h
M +2 -2 libkpimidentities/identity.cpp
--- trunk/KDE/kdepim/akregator/src/articleviewer.cpp #681023:681024
@@ -46,7 +46,7 @@
#include <QClipboard>
#include <QGridLayout>
-#include <libkdepim/kfileio.h>
+#include <kpimutils/kfileio.h>
#include "akregatorconfig.h"
#include "openurlrequest.h"
@@ -647,7 +647,7 @@
QString catchPhrase = ""; //not enough space for a catch phrase at default \
window size i18n("Part of the Kontact Suite");
QString quickDescription = i18n("An RSS feed reader for the K Desktop \
Environment.");
- QString content = KPIM::kFileToByteArray(location);
+ QString content = KPIMUtils::kFileToByteArray(location);
QString infocss = KStandardDirs::locate( "data", \
"libkdepim/about/kde_infopage.css" );
QString rtl = kapp->isRightToLeft() ? QString("@import \"%1\";" ).arg( \
KStandardDirs::locate( "data", "libkdepim/about/kde_infopage_rtl.css" \
)) : QString();
--- trunk/KDE/kdepim/kmail/kmcommands.cpp #681023:681024
@@ -120,7 +120,7 @@
#include "broadcaststatus.h"
#include "globalsettings.h"
-#include <libkdepim/kfileio.h>
+#include <kpimutils/kfileio.h>
#include "progressmanager.h"
using KPIM::ProgressManager;
@@ -2925,7 +2925,7 @@
const size_t newsize = KMail::Util::crlf2lf( data.data(), data.size() );
data.truncate( newsize );
}
- KPIM::kByteArrayToFile( data, mAtmName, false, false, false );
+ KPIMUtils::kByteArrayToFile( data, mAtmName, false, false, false );
}
KTemporaryFile *linkFile = new KTemporaryFile();
--- trunk/KDE/kdepim/kmail/kmcomposewin.cpp #681023:681024
@@ -63,7 +63,7 @@
#include <libkpimidentities/identitymanager.h>
#include <libkpimidentities/identitycombo.h>
#include <libkpimidentities/identity.h>
-#include <libkdepim/kfileio.h>
+#include <kpimutils/kfileio.h>
#include <kpimutils/email.h>
#include <kleo/cryptobackendfactory.h>
#include <kleo/exportjob.h>
@@ -3392,7 +3392,7 @@
KTemporaryFile *atmTempFile = new KTemporaryFile();
atmTempFile->open();
mAtmTempList.append( atmTempFile );
- KPIM::kByteArrayToFile( msgPart->bodyDecodedBinary(), atmTempFile->fileName(),
+ KPIMUtils::kByteArrayToFile( msgPart->bodyDecodedBinary(), \
atmTempFile->fileName(), false, false, false );
KMReaderMainWin *win =
new KMReaderMainWin( msgPart, false, atmTempFile->fileName(), pname, mCharset );
@@ -3415,7 +3415,7 @@
KUrl url;
url.setPath( atmTempFile->fileName() );
- KPIM::kByteArrayToFile( msgPart->bodyDecodedBinary(), atmTempFile->fileName(), \
false, false, + KPIMUtils::kByteArrayToFile( msgPart->bodyDecodedBinary(), \
atmTempFile->fileName(), false, false, false );
if ( ::chmod( QFile::encodeName( atmTempFile->fileName() ), S_IRUSR ) != 0) {
QFile::remove(url.path());
--- trunk/KDE/kdepim/kmail/kmedit.cpp #681023:681024
@@ -40,7 +40,7 @@
#include <QTextStream>
#include <QTextEdit>
-#include <libkdepim/kfileio.h>
+#include <kpimutils/kfileio.h>
#include <kpimutils/email.h>
#include <kpimutils/spellingfilter.h>
@@ -528,7 +528,7 @@
setAutoUpdate(false);
clear();
- QByteArray ba = KPIM::kFileToByteArray( fileName, true, false );
+ QByteArray ba = KPIMUtils::kFileToByteArray( fileName, true, false );
insertLine( QString::fromLocal8Bit( ba.data(), ba.size() ), -1 );
setAutoUpdate(true);
repaint();
--- trunk/KDE/kdepim/kmail/kmfilteraction.cpp #681023:681024
@@ -17,7 +17,7 @@
#include <libkpimidentities/identity.h>
#include <libkpimidentities/identitymanager.h>
#include <libkpimidentities/identitycombo.h>
-#include <libkdepim/kfileio.h>
+#include <kpimutils/kfileio.h>
#include <libkdepim/collectingprocess.h>
using KPIM::CollectingProcess;
#include <mimelib/message.h>
@@ -465,15 +465,15 @@
aTempFileList.append( tf );
tempFileName = tf->fileName();
if ((*it) == -1)
- KPIM::kByteArrayToFile( aMsg->asString(), tempFileName, //###
+ KPIMUtils::kByteArrayToFile( aMsg->asString(), tempFileName, //###
false, false, false );
else if (aMsg->numBodyParts() == 0)
- KPIM::kByteArrayToFile( aMsg->bodyDecodedBinary(), tempFileName,
+ KPIMUtils::kByteArrayToFile( aMsg->bodyDecodedBinary(), tempFileName,
false, false, false );
else {
KMMessagePart msgPart;
aMsg->bodyPart( (*it), &msgPart );
- KPIM::kByteArrayToFile( msgPart.bodyDecodedBinary(), tempFileName,
+ KPIMUtils::kByteArrayToFile( msgPart.bodyDecodedBinary(), tempFileName,
false, false, false );
}
tf->close();
@@ -529,7 +529,7 @@
// write message to file
QString tempFileName = inFile->fileName();
- KPIM::kByteArrayToFile( aMsg->asString(), tempFileName, //###
+ KPIMUtils::kByteArrayToFile( aMsg->asString(), tempFileName, //###
false, false, false );
inFile->close();
@@ -1752,7 +1752,7 @@
// write message to file
QString tempFileName = inFile->fileName();
- KPIM::kByteArrayToFile( aMsg->asString(), tempFileName, //###
+ KPIMUtils::kByteArrayToFile( aMsg->asString(), tempFileName, //###
false, false, false );
inFile->close();
--- trunk/KDE/kdepim/kmail/kmfoldermaildir.cpp #681023:681024
@@ -10,7 +10,7 @@
#include <QRegExp>
#include <QByteArray>
-#include <libkdepim/kfileio.h>
+#include <kpimutils/kfileio.h>
#include "kmfoldermaildir.h"
#include "kmfoldermgr.h"
#include "kmfolder.h"
@@ -425,7 +425,7 @@
QString tmp_file(location() + "/tmp/");
tmp_file += filename;
- if ( ! KPIM::kByteArrayToFile( msgText, tmp_file, false, false, false ) )
+ if ( ! KPIMUtils::kByteArrayToFile( msgText, tmp_file, false, false, false ) )
kmkernel->emergencyExit( i18n("Message could not be added to the folder, \
possibly disk space is low.") );
QFile file(tmp_file);
--- trunk/KDE/kdepim/kmail/kmkernel.cpp #681023:681024
@@ -26,7 +26,7 @@
#include "undostack.h"
#include "accountmanager.h"
using KMail::AccountManager;
-#include <libkdepim/kfileio.h>
+#include <kpimutils/kfileio.h>
#include "kmversion.h"
#include "kmreaderwin.h"
#include "kmmainwidget.h"
@@ -398,7 +398,7 @@
msg->setBcc( KMMsgBase::decodeRFC2047String( bcc.toLatin1() ) );
if (!subject.isEmpty()) msg->setSubject(subject);
if (!messageFile.isEmpty() && messageFile.isLocalFile()) {
- QByteArray str = KPIM::kFileToByteArray( messageFile.path(), true, false );
+ QByteArray str = KPIMUtils::kFileToByteArray( messageFile.path(), true, false );
if( !str.isEmpty() ) {
msg->setBody( QString::fromLocal8Bit( str.data(), str.size() ).toUtf8() );
}
@@ -713,7 +713,7 @@
if (!msgUrl.isEmpty() && msgUrl.isLocalFile()) {
const QByteArray messageText =
- KPIM::kFileToByteArray( msgUrl.path(), true, false );
+ KPIMUtils::kFileToByteArray( msgUrl.path(), true, false );
if ( messageText.isEmpty() )
return -2;
@@ -892,7 +892,7 @@
if ( !msgUrl.isEmpty() && msgUrl.isLocalFile() ) {
const QByteArray messageText =
- KPIM::kFileToByteArray( msgUrl.path(), true, false );
+ KPIMUtils::kFileToByteArray( msgUrl.path(), true, false );
if ( messageText.isEmpty() )
return -2;
--- trunk/KDE/kdepim/kmail/kmreaderwin.cpp #681023:681024
@@ -29,7 +29,7 @@
#include "kmversion.h"
#include "kmmainwidget.h"
#include "kmreadermainwin.h"
-#include <libkdepim/kfileio.h>
+#include <kpimutils/kfileio.h>
#include "kmfolderindex.h"
#include "kmcommands.h"
#include "kmmsgpartdlg.h"
@@ -845,7 +845,7 @@
const size_t newsize = KMail::Util::crlf2lf( data.data(), data.size() );
data.truncate( newsize );
}
- KPIM::kByteArrayToFile( data, mAtmCurrentName, false, false, false );
+ KPIMUtils::kByteArrayToFile( data, mAtmCurrentName, false, false, false );
::chmod( QFile::encodeName( mAtmCurrentName ), S_IRUSR );
mAtmUpdate = false;
@@ -1276,7 +1276,7 @@
adjustLayout();
QString location = KStandardDirs::locate("data", "kmail/about/main.html");
- QString content = KPIM::kFileToByteArray( location );
+ QString content = KPIMUtils::kFileToByteArray( location );
content = content.arg( KStandardDirs::locate( "data", \
"libkdepim/about/kde_infopage.css" ) ); if ( QApplication::isRightToLeft() )
content = content.arg( "@import \"" + KStandardDirs::locate( "data",
@@ -1681,7 +1681,7 @@
const size_t newsize = KMail::Util::crlf2lf( data.data(), data.size() );
data.truncate( newsize );
}
- if( !KPIM::kByteArrayToFile( data, fname, false, false, false ) )
+ if( !KPIMUtils::kByteArrayToFile( data, fname, false, false, false ) )
return QString();
mTempFiles.append( fname );
--- trunk/KDE/kdepim/kmail/objecttreeparser.cpp #681023:681024
@@ -37,7 +37,6 @@
#include "kmkernel.h"
#include "kmreaderwin.h"
#include "partNode.h"
-#include <libkdepim/kfileio.h>
#include <kpimutils/email.h>
#include "partmetadata.h"
#include "attachmentstrategy.h"
--- trunk/KDE/kdepim/knode/articlewidget.cpp #681023:681024
@@ -54,8 +54,8 @@
#include <libkpgp/kpgp.h>
#include <libkpgp/kpgpblock.h>
-#include <libkdepim/kfileio.h>
#include <libkdepim/kxface.h>
+#include <kpimutils/kfileio.h>
#include <kpimutils/linklocator.h>
#include <kpimutils/email.h>
@@ -1025,7 +1025,7 @@
QByteArray data = att->decodedContent();
// ### KMail does crlf2lf conversion here before writing the file
- if( !KPIM::kByteArrayToFile( data, fname, false, false, false ) )
+ if( !KPIMUtils::kByteArrayToFile( data, fname, false, false, false ) )
return QString();
mTempFiles.append( fname );
--- trunk/KDE/kdepim/kontact/src/mainwindow.cpp #681023:681024
@@ -60,7 +60,7 @@
#include <ksqueezedtextlabel.h>
#include <khtml_part.h>
#include <khtmlview.h>
-#include <libkdepim/kfileio.h>
+#include <kpimutils/kfileio.h>
#include <krun.h>
#include <kaboutdata.h>
#include <kmenubar.h>
@@ -257,7 +257,7 @@
void MainWindow::paintAboutScreen( const QString& msg )
{
QString location = KStandardDirs::locate( "data", "kontact/about/main.html" );
- QString content = KPIM::kFileToByteArray( location );
+ QString content = KPIMUtils::kFileToByteArray( location );
content = content.arg( KStandardDirs::locate( "data", \
"libkdepim/about/kde_infopage.css" ) ); if ( QApplication::isRightToLeft() )
content = content.arg( "@import \"%1\";" ).arg( KStandardDirs::locate( "data", \
"libkdepim/about/kde_infopage_rtl.css" ) );
--- trunk/KDE/kdepim/libkdepim/CMakeLists.txt #681023:681024
@@ -34,7 +34,6 @@
pluginloaderbase.cpp
addresseelineedit.cpp
kdatepickerpopup.cpp
- kfileio.cpp
configmanager.cpp
collectingprocess.cpp
ldapclient.cpp
--- trunk/KDE/kdepim/libkpimidentities/identity.cpp #681023:681024
@@ -4,7 +4,7 @@
#include "identity.h"
-#include <libkdepim/kfileio.h>
+#include <kpimutils/kfileio.h>
#include <libkdepim/collectingprocess.h>
#include <kdebug.h>
@@ -128,7 +128,7 @@
}
if ( ok ) *ok = true;
// ### hmm, should we allow other encodings, too?
- const QByteArray ba = kFileToByteArray( mUrl, false );
+ const QByteArray ba = KPIMUtils::kFileToByteArray( mUrl, false );
return QString::fromLocal8Bit( ba.data(), ba.size() );
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic