summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kaddressbook/mainembedded.cpp5
-rw-r--r--kmicromail/main.cpp3
-rw-r--r--korganizer/kolistview.cpp1
-rw-r--r--korganizer/koprefs.cpp10
-rw-r--r--korganizer/main.cpp3
-rw-r--r--libkdepim/externalapphandler.cpp10
-rw-r--r--libkdepim/externalapphandler.h2
-rw-r--r--libkdepim/kpimglobalprefs.cpp3
-rw-r--r--microkde/kdeui/klistview.cpp5
-rw-r--r--pwmanager/pwmanager/main.cpp2
-rw-r--r--pwmanager/pwmanager/pwm.cpp2
11 files changed, 26 insertions, 20 deletions
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp
index a8816f9..547d208 100644
--- a/kaddressbook/mainembedded.cpp
+++ b/kaddressbook/mainembedded.cpp
@@ -77,11 +77,11 @@ int main( int argc, char **argv )
KAddressBookMain m ;
//US MainWindow m;
QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
- {
+
KPimGlobalPrefs::instance()->setGlobalConfig();
- }
+
#ifndef DESKTOP_VERSION
a.showMainWidget( &m );
#else
@@ -92,8 +92,9 @@ int main( int argc, char **argv )
a.exec();
dumpMissing();
+ KPimGlobalPrefs::instance()->writeConfig();
}
qDebug("KA: Bye! ");
}
diff --git a/kmicromail/main.cpp b/kmicromail/main.cpp
index 8947ff8..8341c5a 100644
--- a/kmicromail/main.cpp
+++ b/kmicromail/main.cpp
@@ -18,8 +18,9 @@
#include <kglobal.h>
#include <stdio.h>
#include "mainwindow.h"
#include "koprefs.h"
+#include <libkdepim/kpimglobalprefs.h>
void dumpMissing();
//using namespace Opie::Core;
int main( int argc, char **argv ) {
@@ -57,7 +58,9 @@ int main( int argc, char **argv ) {
QObject::connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit()));
#endif
int rv = a.exec();
dumpMissing();
+
+ KPimGlobalPrefs::instance()->writeConfig();
return rv;
}
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index d3aa650..3d4acb7 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -1005,8 +1005,9 @@ KOListViewListView::KOListViewListView(KOListView * lv )
{
#ifndef DESKTOP_VERSION
QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold );
#endif
+ mYMousePos = -1000;
setSelectionMode( QListView::Multi );
setMultiSelection( true);
mAllowPopupMenu = true;
mMouseDown = false;
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index f44debc..8dca3ae 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -166,19 +166,9 @@ KOPrefs::KOPrefs() :
addItemFont("JournalView Font",&mJornalViewFont);
addItemFont("WhatsNextView Font",&mWhatsNextFont);
addItemFont("EventView Font",&mEventViewFont);
-// KPrefs::setCurrentGroup("SyncProfiles");
-// addItemString("LocalMachineName",&mLocalMachineName, "undefined");
-// addItemStringList("SyncProfileNames",&mSyncProfileNames);
-// addItemStringList("ExternSyncProfiles",&mExternSyncProfileNames);
-
KPrefs::setCurrentGroup("RemoteSyncing");
-// addItemBool("UsePasswd",&mUsePassWd,false);
-// addItemBool("WriteBackFile",&mWriteBackFile,true);
-// addItemBool("WriteBackExistingOnly",&mWriteBackExistingOnly,false);
-// addItemBool("AskForPreferences",&mAskForPreferences,true);
-// addItemBool("ShowSyncSummary",&mShowSyncSummary,true);
addItemString("ActiveSyncPort",&mActiveSyncPort,"9197" );
addItemString("ActiveSyncIP",&mActiveSyncIP,"192.168.0.40" );
addItemBool("ShowSyncEvents",&mShowSyncEvents,false);
addItemInt("LastSyncTime",&mLastSyncTime,0);
diff --git a/korganizer/main.cpp b/korganizer/main.cpp
index 4194d12..2481ca4 100644
--- a/korganizer/main.cpp
+++ b/korganizer/main.cpp
@@ -18,8 +18,9 @@
#include <kstandarddirs.h>
#include <kglobal.h>
#include <stdio.h>
#include "mainwindow.h"
+#include <libkdepim/kpimglobalprefs.h>
void dumpMissing();
int main( int argc, char **argv )
{
#ifndef DESKTOP_VERSION
@@ -100,7 +101,9 @@ int main( int argc, char **argv )
}
a.exec();
dumpMissing();
+
+ KPimGlobalPrefs::instance()->writeConfig();
}
qDebug("KO: Bye! ");
}
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp
index 779b20e..9085673 100644
--- a/libkdepim/externalapphandler.cpp
+++ b/libkdepim/externalapphandler.cpp
@@ -60,9 +60,9 @@ QCopTransferItem::QCopTransferItem(int usedSourceParameters, const QString& sour
: _usedSourceParameters(usedSourceParameters), _sourceMessage(sourceMessage), _targetChannel(targetChannel), _targetMessage(targetMessage)
{
//sourceMessage passes later three parameters: sourceChannel, uid, param1
if (_usedSourceParameters == 0)
- _sourceMessageParameters = "(QString,QString)";
+ _sourceMessageParameters = "QString,QString)";
else if (_usedSourceParameters == 1)
_sourceMessageParameters = "(QString,QString,QString)";
else if (_usedSourceParameters == 2)
_sourceMessageParameters = "(QString,QString,QString,QString)";
@@ -256,8 +256,12 @@ bool QCopMapTransferItem::appMessage( const QCString& cmsg, const QByteArray& da
/*********************************************************************************
*
********************************************************************************/
+QCopListTransferItem::~QCopListTransferItem()
+{
+
+}
QCopListTransferItem::QCopListTransferItem(int usedSourceParameters, const QString& sourceMessage, const QString& targetChannel, const QString& targetMessage)
: QCopTransferItem(usedSourceParameters, sourceMessage, targetChannel,targetMessage)
{
@@ -375,8 +379,12 @@ ExternalAppHandler::ExternalAppHandler()
}
ExternalAppHandler::~ExternalAppHandler()
{
+ delete mNameEmailUidListFromKAPITransfer;
+ //delete mFindByEmailFromKAPITransfer;
+ delete mDisplayDetails;
+ delete mBirthdayListFromKAPITransfer;
}
void ExternalAppHandler::receivedNameEmailUidList_Slot(const QString& uid,
const QStringList& nameList,
diff --git a/libkdepim/externalapphandler.h b/libkdepim/externalapphandler.h
index 4c6f1ea..6f5d345 100644
--- a/libkdepim/externalapphandler.h
+++ b/libkdepim/externalapphandler.h
@@ -99,9 +99,9 @@ class QCopListTransferItem : public QCopTransferItem
{
Q_OBJECT
public:
QCopListTransferItem(int usedSourceParameters, const QString& sourceMessage, const QString& targetChannel, const QString& targetMessage);
-
+ ~QCopListTransferItem();
bool sendMessageToSource(const QString& uid, const QStringList& list1, const QStringList& list2, const QStringList& list3, const QStringList& list4, const QStringList& list5, const QStringList& list6);
virtual bool appMessage( const QCString& msg, const QByteArray& data );
diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp
index 3771569..0fdc3e4 100644
--- a/libkdepim/kpimglobalprefs.cpp
+++ b/libkdepim/kpimglobalprefs.cpp
@@ -143,8 +143,9 @@ void KPimGlobalPrefs::setGlobalConfig()
line = text.mid( br, nbr - br );
br = nbr+1;
int se, ee, st, et;
mLocaleDict = new QDict<QString>;
+ mLocaleDict->setAutoDelete( true );
QString end = "{ \"\",\"\" }";
while ( (line != end) && (br > 1) ) {
//qDebug("%d *%s* ", br, line.latin1());
se = line.find("\"")+1;
@@ -187,10 +188,8 @@ KPimGlobalPrefs::~KPimGlobalPrefs()
if (sInstance == this)
sInstance = staticDeleterGP.setObject(0);
else
qDebug("Whats this? Error in KPimGlobalPrefs::~KPimGlobalPrefs() ?");
- //qDebug("KPimGlobalPrefs::~KPimGlobalPrefs() ");
- writeConfig();
if ( mLocaleDict )
delete mLocaleDict;
}
diff --git a/microkde/kdeui/klistview.cpp b/microkde/kdeui/klistview.cpp
index 5b50ba9..3c809b4 100644
--- a/microkde/kdeui/klistview.cpp
+++ b/microkde/kdeui/klistview.cpp
@@ -93,9 +93,8 @@ public:
bChangeCursorOverItem(false),
itemsMovable (true),
selectedBySimpleMove(false),
selectedUsingMouse(false),
- showContextMenusOnPress(true),
itemsRenameable (false),
validDrag (false),
dragEnabled (false),
autoOpen (true),
@@ -110,10 +109,10 @@ public:
sortColumn(0),
selectionDirection(0),
tooltipColumn (0),
selectionMode (Single),
-//US contextMenuKey (KGlobalSettings::contextMenuKey()),
-//US showContextMenusOnPress (KGlobalSettings::showContextMenusOnPress()),
+ contextMenuKey ( Qt::Key_Menu ),//KGlobalSettings::contextMenuKey()),
+ showContextMenusOnPress (true),//showContextMenusOnPress (KGlobalSettings::showContextMenusOnPress()),
mDropVisualizerWidth (4)
{
renameable += 0;
//US connect(editor, SIGNAL(done(QListViewItem*,int)), listview, SLOT(doneEditing(QListViewItem*,int)));
diff --git a/pwmanager/pwmanager/main.cpp b/pwmanager/pwmanager/main.cpp
index 3f2d055..81e257f 100644
--- a/pwmanager/pwmanager/main.cpp
+++ b/pwmanager/pwmanager/main.cpp
@@ -203,9 +203,9 @@ int main(int argc, char *argv[])
m.show();
#endif
*/
a.exec();
-
+ KPimGlobalPrefs::instance()->writeConfig();
}
qDebug("PWMPI: Bye! ");
#endif
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp
index b7b5307..d92c90d 100644
--- a/pwmanager/pwmanager/pwm.cpp
+++ b/pwmanager/pwmanager/pwm.cpp
@@ -171,8 +171,9 @@ PwM::PwM(PwMInit *_init, PwMDoc *doc,
: KMainWindow(parent, "HALLO")
, forceQuit (false)
, forceMinimizeToTray (false)
{
+ syncManager = 0;
virgin = !virginity;
init = _init;
connect(doc, SIGNAL(docClosed(PwMDoc *)),
this, SLOT(docClosed(PwMDoc *)));
@@ -198,8 +199,9 @@ PwM::~PwM()
conf()->confWndMainWndSize(size());
emit closed(this);
//qDebug("PwM::~PwM() emited closed(this)");
delete view;
+ delete syncManager;
}
void PwM::initMenubar()
{