wilderjds
/
kmail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

It nearly compiles with QT_NO_COMPAT now, besides a few khtml headers which

Browse Source 
make trouble.

svn path=/trunk/kdenetwork/kmail/; revision=114869
wilder-work
Michael Haeckel 25 years ago
parent afaa128982
commit 030afdb5c7
12 changed files with 46 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      accountdialog.cpp
  2. 18
      configuredialog.cpp
  3. 4
      configuredialog.h
  4. 2
      kmacctimap.h
  5. 7
      kmcomposewin.cpp
  6. 10
      kmcomposewin.h
  7. 9
      kmfoldermbox.cpp
  8. 4
      kmfoldertree.cpp
  9. 16
      kmheaders.cpp
  10. 4
      kmheaders.h
  11. 4
      kmmsglist.h
  12. 10
      kmreaderwin.cpp

4
accountdialog.cpp
Unescape View File

@ -108,9 +108,9 @@ ProcmailRCParser::ProcmailRCParser(QString fname)
s = s.stripWhiteSpace();
}
if( lockFileGlobal.match(s) != -1 ) {
if( lockFileGlobal.search(s) != -1 ) {
processGlobalLock(s);
} else if( lockFileLocal.match(s) != -1 ) {
} else if( lockFileLocal.search(s) != -1 ) {
processLocalLock(s);
} else if( int i = s.find('=') ) {
processVariableSetting(s,i);

18
configuredialog.cpp
Unescape View File

@ -1704,23 +1704,23 @@ void ConfigureDialog::setupAppearancePage( void )
{
KConfigGroupSaver saver(config, "Reader");
QColor defaultColor = QColor(kapp->palette().normal().base());
QColor defaultColor = QColor(kapp->palette().active().base());
mAppearance.colorList->setColor(
0, config->readColorEntry("BackgroundColor",&defaultColor ) );
defaultColor = QColor(kapp->palette().normal().text());
defaultColor = QColor(kapp->palette().active().text());
mAppearance.colorList->setColor(
1, config->readColorEntry("ForegroundColor",&defaultColor ) );
defaultColor = QColor(kapp->palette().normal().text());
defaultColor = QColor(kapp->palette().active().text());
mAppearance.colorList->setColor(
2, config->readColorEntry("QuoutedText1",&defaultColor ) );
defaultColor = QColor(kapp->palette().normal().text());
defaultColor = QColor(kapp->palette().active().text());
mAppearance.colorList->setColor(
3, config->readColorEntry("QuoutedText2",&defaultColor ) );
defaultColor = QColor(kapp->palette().normal().text());
defaultColor = QColor(kapp->palette().active().text());
mAppearance.colorList->setColor(
4, config->readColorEntry("QuoutedText3",&defaultColor ) );
@ -2041,8 +2041,8 @@ void ConfigureDialog::installProfile( void )
mAppearance.font[5] = QFont("helvetica");
mAppearance.customFontCheck->setChecked( true );
mAppearance.colorList->setColor( 0, kapp->palette().normal().base() );
mAppearance.colorList->setColor( 1, kapp->palette().normal().text() );
mAppearance.colorList->setColor( 0, kapp->palette().active().base() );
mAppearance.colorList->setColor( 1, kapp->palette().active().text() );
mAppearance.colorList->setColor( 2, red );
mAppearance.colorList->setColor( 3, darkGreen );
mAppearance.colorList->setColor( 4, darkMagenta );
@ -2068,8 +2068,8 @@ void ConfigureDialog::installProfile( void )
mAppearance.font[5] = QFont("helvetica");
mAppearance.customFontCheck->setChecked( true );
mAppearance.colorList->setColor( 0, kapp->palette().normal().base() );
mAppearance.colorList->setColor( 1, kapp->palette().normal().text() );
mAppearance.colorList->setColor( 0, kapp->palette().active().base() );
mAppearance.colorList->setColor( 1, kapp->palette().active().text() );
mAppearance.colorList->setColor( 2, red );
mAppearance.colorList->setColor( 3, darkGreen );
mAppearance.colorList->setColor( 4, darkMagenta );

4
configuredialog.h
Unescape View File

@ -171,7 +171,7 @@ class IdentityList
void remove( const QString &identity );
private:
QList<IdentityEntry> mList;
QPtrList<IdentityEntry> mList;
};
class LanguageItem
@ -530,7 +530,7 @@ private:
QGuardedPtr<KMAccount> newAccount;
};
QValueList<mModifiedAccountsType*> mModifiedAccounts;
QList<KMTransportInfo> mTransportList;
QPtrList<KMTransportInfo> mTransportList;
bool secondIdentity;
};

2
kmacctimap.h
Unescape View File

@ -222,7 +222,7 @@ protected:
QTimer mIdleTimer;
KIO::Slave *mSlave;
KIO::MetaData mSlaveConfig;
QList<KMImapJob> mJobList;
QPtrList<KMImapJob> mJobList;
KMFolderImap *mFolder;
protected slots:

7
kmcomposewin.cpp
Unescape View File

@ -320,8 +320,8 @@ void KMComposeWin::readColorConfig(void)
{
KConfig *config = kapp->config();
KConfigGroupSaver saver(config, "Reader");
QColor c1=QColor(kapp->palette().normal().text());
QColor c4=QColor(kapp->palette().normal().base());
QColor c1=QColor(kapp->palette().active().text());
QColor c4=QColor(kapp->palette().active().base());
if (!config->readBoolEntry("defaultColors",TRUE)) {
foreColor = config->readColorEntry("ForegroundColor",&c1);
@ -334,10 +334,9 @@ void KMComposeWin::readColorConfig(void)
// Color setup
mPalette = kapp->palette();
QColorGroup cgrp = mPalette.normal();
QColorGroup cgrp = mPalette.active();
cgrp.setColor( QColorGroup::Base, backColor);
cgrp.setColor( QColorGroup::Text, foreColor);
mPalette.setNormal(cgrp);
mPalette.setDisabled(cgrp);
mPalette.setActive(cgrp);
mPalette.setInactive(cgrp);

10
kmcomposewin.h
Unescape View File

@ -53,7 +53,7 @@ class KToolBar;
class KToggleAction;
class KURL;
typedef QList<KMMessagePart> KMMsgPartList;
typedef QPtrList<KMMessagePart> KMMsgPartList;
//-----------------------------------------------------------------------------
@ -498,14 +498,14 @@ protected:
QGridLayout* mGrid;
KMMessage *mMsg;
QListView *mAtmListBox;
QList<QListViewItem> mAtmItemList;
QPtrList<QListViewItem> mAtmItemList;
KMMsgPartList mAtmList;
bool mAutoSign, mAutoPgpSign, mAutoDeleteMsg;
KMFolder *mFolder;
long mShowHeaders;
QString mExtEditor;
bool useExtEditor;
QList<_StringPair> mCustHeaders;
QPtrList<_StringPair> mCustHeaders;
bool mConfirmSend;
bool disableBreaking;
int mNumHeaders;
@ -515,8 +515,8 @@ protected:
short mMnuIdUrgent, mMnuIdConfDeliver, mMnuIdConfRead;
QFont mBodyFont;
// QList<QLineEdit> mEdtList;
QList<QWidget> mEdtList;
QList<KTempFile> mAtmTempList;
QPtrList<QWidget> mEdtList;
QPtrList<KTempFile> mAtmTempList;
QPalette mPalette;
QString mId, mOldSigText;
QStringList mTransportHistory;

9
kmfoldermbox.cpp
Unescape View File

@ -476,7 +476,7 @@ int KMFolderMbox::createIndexFromContents()
if (atEof ||
(strncmp(line,MSG_SEPERATOR_START, msgSepLen)==0 &&
regexp.match(line) >= 0))
regexp.search(line) >= 0))
{
size = pos - offs;
pos = ftell(mStream);
@ -681,7 +681,7 @@ int KMFolderMbox::addMsg(KMMessage* aMsg, int* aIndex_ret)
int idx = -1, rc;
KMFolder* msgParent;
bool editing = false;
int growth = 0, oldlength = 0;
int growth = 0;
if (isIndexOutdated()) {
kdDebug(5006) << "Critical error: " << location() <<
@ -811,7 +811,7 @@ int KMFolderMbox::addMsg(KMMessage* aMsg, int* aIndex_ret)
// change the length of the previous message to encompass white space added
if ((idx > 0) && (growth > 0)) {
// don't grow if a deleted message claims space at the end of the file
if (revert == mMsgList[idx - 1]->folderOffset() + mMsgList[idx - 1]->msgSize() )
if ((ulong)revert == mMsgList[idx - 1]->folderOffset() + mMsgList[idx - 1]->msgSize() )
mMsgList[idx - 1]->setMsgSize( mMsgList[idx - 1]->msgSize() + growth );
}
@ -903,7 +903,8 @@ int KMFolderMbox::compact()
open();
KMMsgInfo* mi;
int msize, offs=0, msgs=0, folder_offset;
uint msize, folder_offset;
int offs=0, msgs=0;
QCString mtext;
for(int idx = 0; idx < mMsgList.count(); idx++) {
if(!(msgs++ % 10)) {

4
kmfoldertree.cpp
Unescape View File

@ -276,9 +276,9 @@ void KMFolderTree::readColorConfig (void)
KConfig* conf = kapp->config();
// Custom/System color support
KConfigGroupSaver saver(conf, "Reader");
QColor c1=QColor(kapp->palette().normal().text());
QColor c1=QColor(kapp->palette().active().text());
QColor c2=QColor("blue");
QColor c4=QColor(kapp->palette().normal().base());
QColor c4=QColor(kapp->palette().active().base());
if (!conf->readBoolEntry("defaultColors",TRUE)) {
mPaintInfo.colFore = conf->readColorEntry("ForegroundColor",&c1);

16
kmheaders.cpp
Unescape View File

@ -8,8 +8,8 @@
#include <qdatetime.h>
#include <qheader.h>
#include <qdragobject.h>
#include <qstack.h>
#include <qqueue.h>
#include <qptrstack.h>
#include <qptrqueue.h>
#include <qheader.h>
#include <qpainter.h>
@ -522,10 +522,10 @@ void KMHeaders::readColorConfig (void)
KConfig* config = kapp->config();
// Custom/System colors
KConfigGroupSaver saver(config, "Reader");
QColor c1=QColor(kapp->palette().normal().text());
QColor c1=QColor(kapp->palette().active().text());
QColor c2=QColor("red");
QColor c3=QColor("blue");
QColor c4=QColor(kapp->palette().normal().base());
QColor c4=QColor(kapp->palette().active().base());
QColor c5=QColor(0,0x7F,0);
if (!config->readBoolEntry("defaultColors",TRUE)) {
@ -2617,9 +2617,9 @@ bool KMHeaders::writeSortOrder()
fwrite(&discovered_count, sizeof(discovered_count), 1, sortStream);
fwrite(&sorted_count, sizeof(sorted_count), 1, sortStream);
QStack<KMHeaderItem> items;
QPtrStack<KMHeaderItem> items;
{
QStack<QListViewItem> s;
QPtrStack<QListViewItem> s;
for (QListViewItem * i = firstChild(); i; ) {
items.push((KMHeaderItem *)i);
if ( i->firstChild() ) {
@ -2818,7 +2818,7 @@ bool KMHeaders::readSortOrder(bool set_selection)
//all cases
int column, ascending, threaded, discovered_count, sorted_count, appended;
bool unread_exists = false;
QArray<KMSortCacheItem *> sortCache(mFolder->count());
QMemArray<KMSortCacheItem *> sortCache(mFolder->count());
KMSortCacheItem root;
root.setId(-666); //mark of the root!
@ -3029,7 +3029,7 @@ bool KMHeaders::readSortOrder(bool set_selection)
START_TIMER(header_creation);
KMHeaderItem *khi;
KMSortCacheItem *i, *new_kci;
QQueue<KMSortCacheItem> s;
QPtrQueue<KMSortCacheItem> s;
s.enqueue(&root);
do {
i = s.dequeue();

4
kmheaders.h
Unescape View File

@ -21,7 +21,7 @@ class QPixmap;
class QIconSet;
class KMScoringManager;
typedef QList<KMMsgBase> KMMessageList;
typedef QPtrList<KMMsgBase> KMMessageList;
typedef QMap<int,KMFolder*> KMMenuToFolder;
/** A special drag class for header list to folder tree DnD operations */
@ -295,7 +295,7 @@ private:
/** Current item */
int mCurrentItem;
/** Map messages ids into KMHeaderItems */
QArray<KMHeaderItem*> mItems;
QMemArray<KMHeaderItem*> mItems;
QDict< KMHeaderItem > mIdTree;
QDict< KMHeaderItem > mPhantomIdTree;
QDict< QValueList< int > > mTree;

4
kmmsglist.h
Unescape View File

@ -9,8 +9,8 @@
#include "kmmsgbase.h"
#define KMMsgListInherited QArray<KMMsgBasePtr>
class KMMsgList: public QArray<KMMsgBasePtr>
#define KMMsgListInherited QMemArray<KMMsgBasePtr>
class KMMsgList: public QMemArray<KMMsgBasePtr>
{
public:
/** Valid parameters for sort() */

10
kmreaderwin.cpp
Unescape View File

@ -156,10 +156,10 @@ void KMReaderWin::readColorConfig(void)
KConfig *config = kapp->config();
KConfigGroupSaver saver(config, "Reader");
c1 = QColor(kapp->palette().normal().text());
c1 = QColor(kapp->palette().active().text());
c2 = KGlobalSettings::linkColor();
c3 = KGlobalSettings::visitedLinkColor();
c4 = QColor(kapp->palette().normal().base());
c4 = QColor(kapp->palette().active().base());
if (!config->readBoolEntry("defaultColors",TRUE)) {
c1 = config->readColorEntry("ForegroundColor",&c1);
@ -254,11 +254,11 @@ QString KMReaderWin::quoteFontTag( int quoteLevel )
KConfigGroupSaver saver(config, "Reader");
if( config->readBoolEntry( "defaultColors", true ) == true )
{
color = QColor(kapp->palette().normal().text());
color = QColor(kapp->palette().active().text());
}
else
{
QColor defaultColor = QColor(kapp->palette().normal().text());
QColor defaultColor = QColor(kapp->palette().active().text());
if( quoteLevel == 0 )
color = config->readColorEntry( "QuoutedText1", &defaultColor );
else if( quoteLevel == 1 )
@ -266,7 +266,7 @@ QString KMReaderWin::quoteFontTag( int quoteLevel )
else if( quoteLevel == 2 )
color = config->readColorEntry( "QuoutedText3", &defaultColor );
else
color = QColor(kapp->palette().normal().base());
color = QColor(kapp->palette().active().base());
}
}

Write Preview
Loading…
Cancel
Save