[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdepim/kpilot
From: Jason vanRijn Kasper <vR () movingparts ! net>
Date: 2007-08-01 3:52:31
Message-ID: 1185940351.780597.21493.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 694912 by vanrijn:
- bringing back name into the constructor of our classes, as they were
before the kde4 port. I'm still hitting a weird SIGSEGV from
corelib/arch/qatomic_i386.h:70, but I can't figure out what's causing it.
will look at it more later...
M +1 -1 conduits/base/recordconduit.cc
M +1 -1 conduits/memofileconduit/memofile-conduit.cc
M +1 -1 conduits/notepadconduit/notepad-conduit.cc
M +1 -1 conduits/null/null-conduit.cc
M +1 -1 conduits/popmail/popmail-conduit.cc
M +1 -1 conduits/timeconduit/time-conduit.cc
M +1 -1 conduits/vcalconduit/vcal-conduitbase.cc
M +4 -8 kpilot/hotSync.cc
M +1 -2 kpilot/internalEditorAction.cc
M +1 -2 lib/actionQueue.cc
M +4 -8 lib/actions.cc
M +4 -2 lib/plugin.cc
M +1 -0 lib/plugin.h
M +6 -2 lib/syncAction.cc
M +5 -3 lib/syncAction.h
--- trunk/KDE/kdepim/kpilot/conduits/base/recordconduit.cc #694911:694912
@@ -41,7 +41,7 @@
RecordConduit::RecordConduit( KPilotLink *o, const QStringList &a
, const QString &databaseName, const QString &conduitName ) :
- ConduitAction(o, a),
+ ConduitAction(o, "RecordConduitBase", a),
fHHDataProxy(0L),
fBackupDataProxy(0L),
fPCDataProxy(0L)
--- trunk/KDE/kdepim/kpilot/conduits/memofileconduit/memofile-conduit.cc #694911:694912
@@ -55,7 +55,7 @@
*/
MemofileConduit::MemofileConduit(KPilotLink *d,
const QStringList &l) :
- ConduitAction(d,l),
+ ConduitAction(d, "Memofile", l),
_DEFAULT_MEMODIR(QDir::homePath() + CSL1("/MyMemos")),
fMemoAppInfo(0L),
_memofiles(0L)
--- trunk/KDE/kdepim/kpilot/conduits/notepadconduit/notepad-conduit.cc #694911:694912
@@ -50,7 +50,7 @@
#include <QEvent>
NotepadConduit::NotepadConduit(KPilotLink *d,
- const QStringList &args) : ConduitAction(d, args)
+ const QStringList &args) : ConduitAction(d, "Notepad", args)
{
FUNCTIONSETUP;
fConduitName=i18n("Notepad");
--- trunk/KDE/kdepim/kpilot/conduits/null/null-conduit.cc #694911:694912
@@ -53,7 +53,7 @@
//
NullConduit::NullConduit(KPilotLink *d,
const QStringList &l) :
- ConduitAction(d,l),
+ ConduitAction(d, "Null", l),
fDatabase(0L),
fFailImmediately( l.contains( CSL1("--fail") ))
{
--- trunk/KDE/kdepim/kpilot/conduits/popmail/popmail-conduit.cc #694911:694912
@@ -74,7 +74,7 @@
PopMailConduit::PopMailConduit(KPilotLink *d,
const QStringList &l) :
- ConduitAction(d,l)
+ ConduitAction(d,"Popmail",l)
{
FUNCTIONSETUP;
fConduitName=i18n("KMail");
--- trunk/KDE/kdepim/kpilot/conduits/timeconduit/time-conduit.cc #694911:694912
@@ -45,7 +45,7 @@
TimeConduit::TimeConduit(KPilotLink * o,
const QStringList & a) :
- ConduitAction(o, a)
+ ConduitAction(o, "Time", a)
{
FUNCTIONSETUP;
fConduitName=i18n("Time");
--- trunk/KDE/kdepim/kpilot/conduits/vcalconduit/vcal-conduitbase.cc #694911:694912
@@ -68,7 +68,7 @@
VCalConduitBase::VCalConduitBase(KPilotLink *d,
const QStringList &a) :
- ConduitAction(d,a),
+ ConduitAction(d,"VCalConduitBase",a),
fCalendar(0L),
fP(0L)
{
--- trunk/KDE/kdepim/kpilot/kpilot/hotSync.cc #694911:694912
@@ -174,11 +174,10 @@
} ;
BackupAction::BackupAction(KPilotLink * p, bool full) :
- SyncAction(p),
+ SyncAction(p, "backupAction"),
fP( new Private ),
fBackupThread( 0L )
{
- setObjectName("backupAction");
FUNCTIONSETUP;
fP->fFullBackup = full;
@@ -579,12 +578,11 @@
FileInstallAction::FileInstallAction(KPilotLink * p,
const QString & d) :
- SyncAction(p),
+ SyncAction(p, "fileInstall"),
fDBIndex(-1),
fTimer(0L),
fDir(d)
{
- setObjectName("fileInstall");
FUNCTIONSETUP;
}
@@ -775,9 +773,8 @@
}
CheckUser::CheckUser(KPilotLink * p, QWidget * vp):
- SyncAction(p, vp)
+ SyncAction(p, vp, "userCheck")
{
- setObjectName("userCheck");
FUNCTIONSETUP;
}
@@ -954,9 +951,8 @@
RestoreAction::RestoreAction(KPilotLink * p, QWidget * visible ) :
- SyncAction(p, visible)
+ SyncAction(p, visible, "restoreAction")
{
- setObjectName("restoreAction");
FUNCTIONSETUP;
fP = new Private;
--- trunk/KDE/kdepim/kpilot/kpilot/internalEditorAction.cc #694911:694912
@@ -53,9 +53,8 @@
using namespace KHE;
InternalEditorAction::InternalEditorAction(KPilotLink * p) :
- SyncAction(p)
+ SyncAction(p, "internalSync")
{
- setObjectName("internalSync");
FUNCTIONSETUP;
}
--- trunk/KDE/kdepim/kpilot/lib/actionQueue.cc #694911:694912
@@ -40,10 +40,9 @@
ActionQueue::ActionQueue(KPilotLink *d) :
- SyncAction(d)
+ SyncAction(d, "ActionQueue")
// The string lists have default constructors
{
- setObjectName("ActionQueue");
FUNCTIONSETUP;
}
--- trunk/KDE/kdepim/kpilot/lib/actions.cc #694911:694912
@@ -42,9 +42,8 @@
WelcomeAction::WelcomeAction(KPilotLink *p) :
- SyncAction(p)
+ SyncAction(p, "welcomeAction")
{
- setObjectName("welcomeAction");
FUNCTIONSETUP;
}
@@ -60,10 +59,9 @@
}
SorryAction::SorryAction(KPilotLink *p, const QString &s) :
- SyncAction(p),
+ SyncAction(p, "sorryAction"),
fMessage(s)
{
- setObjectName("sorryAction");
if (fMessage.isEmpty())
{
fMessage = i18n("KPilot is busy and cannot process the "
@@ -79,9 +77,8 @@
return delayDone();
}
-CleanupAction::CleanupAction(KPilotLink *p) : SyncAction(p)
+CleanupAction::CleanupAction(KPilotLink *p) : SyncAction(p, "cleanupAction")
{
- setObjectName("cleanupAction");
FUNCTIONSETUP;
}
@@ -99,9 +96,8 @@
TestLink::TestLink(KPilotLink * p) :
- SyncAction(p)
+ SyncAction(p, "testLink")
{
- setObjectName("testLink");
FUNCTIONSETUP;
}
--- trunk/KDE/kdepim/kpilot/lib/plugin.cc #694911:694912
@@ -45,6 +45,7 @@
#include <qtabwidget.h>
#include <qtimer.h>
#include <QPixmap>
+#include <QString>
#include <qtextedit.h>
#include <kglobal.h>
@@ -267,8 +268,9 @@
ConduitAction::ConduitAction(KPilotLink *p,
+ const char *name,
const QStringList &args) :
- SyncAction(p),
+ SyncAction(p, name),
fDatabase(0L),
fLocalDatabase(0L),
fSyncDirection(args),
@@ -443,7 +445,7 @@
ConduitProxy::ConduitProxy(KPilotLink *p,
const QString &name,
const SyncAction::SyncMode &m) :
- ConduitAction(p,m.list()),
+ ConduitAction(p,name.toLatin1(),m.list()),
fDesktopName(name)
{
FUNCTIONSETUP;
--- trunk/KDE/kdepim/kpilot/lib/plugin.h #694911:694912
@@ -193,6 +193,7 @@
public:
ConduitAction(KPilotLink *,
+ const char *name,
const QStringList &args = QStringList());
virtual ~ConduitAction();
--- trunk/KDE/kdepim/kpilot/lib/syncAction.cc #694911:694912
@@ -53,21 +53,25 @@
#include "syncAction.moc"
#include "kpilotlibSettings.h"
-SyncAction::SyncAction(KPilotLink *p)
+SyncAction::SyncAction(KPilotLink *p,
+ const char * name)
: QObject(p),
fHandle(p),
fParent(0L)
{
FUNCTIONSETUP;
+ setObjectName(name);
}
SyncAction::SyncAction(KPilotLink *p,
- QWidget * visibleparent):
+ QWidget * visibleparent,
+ const char *name) :
QObject(p),
fHandle(p),
fParent(visibleparent)
{
FUNCTIONSETUP;
+ setObjectName(name);
}
SyncAction::~SyncAction()
--- trunk/KDE/kdepim/kpilot/lib/syncAction.h #694911:694912
@@ -47,9 +47,11 @@
Q_OBJECT
public:
- SyncAction(KPilotLink *p);
- SyncAction(KPilotLink *p,
- QWidget *visibleparent);
+ SyncAction(KPilotLink *p,
+ const char *name);
+ SyncAction(KPilotLink *p,
+ QWidget *visibleparent,
+ const char *name);
~SyncAction();
typedef enum { Error=-1 } Status;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic