* 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

1 files changed, 6 insertions, 5 deletions

diff --git a/kmail/snippetdlg.h b/kmail/snippetdlg.h
index fd990539f..efd7bc534 100644
--- a/kmail/snippetdlg.h
+++ b/kmail/snippetdlg.h
@@ -20,7 +20,7 @@ class SnippetDlg : public SnippetDlgBase
 {
     Q_OBJECT
 
-public:
+  public:
     SnippetDlg( KActionCollection* ac, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~SnippetDlg();
 
@@ -31,12 +31,13 @@ public:
     KKeyButton* keyButton;
     KActionCollection* actionCollection;
 
-private slots:
-    void slotCapturedShortcut( const KShortcut& );
-
-protected slots:
+  protected slots:
+    void slotTextChanged( const TQString& );
+    void slotReturnPressed();
     virtual void languageChange();
 
+  private slots:
+    void slotCapturedShortcut( const KShortcut& );
 };
 
 #endif // SNIPPETDLG_H