summaryrefslogtreecommitdiffstats
path: root/libkdepim/kincidencechooser.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
commitcc29364f06178f8f6b457384f2ec37a042bd9d43 (patch)
tree7c77a3184c698bbf9d98cef09fb1ba8124daceba /libkdepim/kincidencechooser.h
parent4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff)
downloadtdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.tar.gz
tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.zip
* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch
* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed * Added journal read support to the CalDAV resource * Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'libkdepim/kincidencechooser.h')
-rw-r--r--libkdepim/kincidencechooser.h53
1 files changed, 24 insertions, 29 deletions
diff --git a/libkdepim/kincidencechooser.h b/libkdepim/kincidencechooser.h
index 8c569e33e..9d9e016ad 100644
--- a/libkdepim/kincidencechooser.h
+++ b/libkdepim/kincidencechooser.h
@@ -24,44 +24,40 @@
#ifndef _KINCIDENCECHOOSER_H
#define _KINCIDENCECHOOSER_H
+#include "calendardiffalgo.h"
+#include "htmldiffalgodisplay.h"
#include <kdialogbase.h>
-#include <tqptrlist.h>
-#include <tqmutex.h>
-#include <kdepimmacros.h>
-
-#include <libkcal/incidence.h>
-#include "htmldiffalgodisplay.h"
-#include "calendardiffalgo.h"
+namespace KCal {
+ class Incidence;
+}
+using namespace KCal;
-class TQRadioButton;
class TQButtonGroup;
-class TQVBox;
-class TQStringList;
-class TQTextBrowser;
-class KDialogBase;
/** Dialog to change the korganizer configuration.
*/
class KDE_EXPORT KIncidenceChooser : public KDialog
{
- Q_OBJECT
-public:
- enum mode { local, remote, newest, ask, both };
+ Q_OBJECT
+ public:
+ enum mode {
+ local, remote, newest, ask, both
+ };
/** Initialize dialog and pages */
- KIncidenceChooser(TQWidget *parent=0,char *name=0);
+ KIncidenceChooser( TQWidget *parent=0, char *name=0 );
~KIncidenceChooser();
//void setChooseText( TQString );
- void setIncidence( KCal::Incidence*,KCal::Incidence*);
- KCal::Incidence* getIncidence();
+ void setIncidence( KCal::Incidence *, KCal::Incidence * );
+ KCal::Incidence *getIncidence();
static int chooseMode;
-public slots:
+ public slots:
void useGlobalMode();
-protected slots:
+ protected slots:
void showIncidence1();
void showIncidence2();
void showDiff();
@@ -72,16 +68,15 @@ protected slots:
void setSyncMode();
void detailsDialogClosed();
-protected:
-private:
- KPIM::HTMLDiffAlgoDisplay* mDisplayDiff;
- KPIM::CalendarDiffAlgo* diff;
- KDialogBase* mTbL, *mTbN;
- KCal::Incidence* choosedIncidence;
- KCal::Incidence* mInc1, *mInc2;
+ private:
+ KPIM::HTMLDiffAlgoDisplay *mDisplayDiff;
+ KPIM::CalendarDiffAlgo *diff;
+ KDialogBase *mTbL, *mTbN;
+ KCal::Incidence *mSelIncidence;
+ KCal::Incidence *mInc1, *mInc2;
TQButtonGroup *mBg;
- TQPushButton *diffBut,*showDetails1,*showDetails2;
- TQLabel* mInc1lab, *mInc2lab,* mInc1Sumlab, *mInc2Sumlab,*mMod1lab,*mMod2lab;
+ TQPushButton *mDiffBut,*mShowDetails1,*mShowDetails2;
+ TQLabel *mInc1lab, *mInc2lab,* mInc1Sumlab, *mInc2Sumlab,*mMod1lab,*mMod2lab;
};