[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.3/kdeutils/kgpg
From:       Rolf Eike Beer <kde () opensource ! sf-tec ! de>
Date:       2009-10-04 16:58:13
Message-ID: 1254675493.649813.26404.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1031305 by dakon:

clean up editor creation

 M  +6 -7      editor/kgpgeditor.cpp  
 M  +3 -3      editor/kgpgeditor.h  
 M  +1 -3      keysmanager.cpp  
 M  +1 -1      kgpgexternalactions.cpp  


--- branches/KDE/4.3/kdeutils/kgpg/editor/kgpgeditor.cpp #1031304:1031305
@@ -52,14 +52,13 @@
 #include "kgpgtextinterface.h"
 
 
-KgpgEditor::KgpgEditor(QWidget *parent, KGpgItemModel *model, Qt::WFlags f, \
                KShortcut gohome, bool mainwindow)
-          : KXmlGuiWindow(parent, f), view(new KgpgView(this, model))
+KgpgEditor::KgpgEditor(QWidget *parent, KGpgItemModel *model, Qt::WFlags f, \
KShortcut gohome) +          : KXmlGuiWindow(0, f),
+	  view(new KgpgView(this, model)),
+	  m_godefaultkey(gohome),
+	  m_find(0),
+	  m_model(model)
 {
-    m_ismainwindow = mainwindow;
-    m_godefaultkey = gohome;
-    m_find = 0;
-    m_model = model;
-
     // call inits to invoke all other construction parts
     initActions();
 
--- branches/KDE/4.3/kdeutils/kgpg/editor/kgpgeditor.h #1031304:1031305
@@ -38,8 +38,9 @@
     Q_OBJECT
     friend class KgpgView;
 
+    KgpgEditor();	// = delete C++0x
 public:
-    KgpgEditor(QWidget *parent, KGpgItemModel *model, Qt::WFlags f = 0, KShortcut \
gohome = KShortcut(QKeySequence(Qt::CTRL + Qt::Key_Home)), bool mainwindow = false); \
+    KgpgEditor(QWidget *parent, KGpgItemModel *model, Qt::WFlags f, KShortcut \
gohome);  ~KgpgEditor();
 
     void openDocumentFile(const KUrl& url, const QString &encoding = QString());
@@ -112,7 +113,7 @@
     void newText();
 
     void slotRefreshImported(KgpgLibrary *lib, const QStringList &keys);
-    
+
 private:
     QStringList m_customdecrypt;
     QString m_textencoding;
@@ -127,7 +128,6 @@
     KUrl m_docname;
 
     bool m_textchanged;		//< text was changed since last save
-    bool m_ismainwindow;
     bool m_emptytext;		//< this was not saved to a file ever
 
     KGpgItemModel *m_model;
--- branches/KDE/4.3/kdeutils/kgpg/keysmanager.cpp #1031304:1031305
@@ -147,7 +147,7 @@
 	connect(goToDefaultKey, SIGNAL(triggered(bool)), SLOT(slotGotoDefaultKey()));
 	goToDefaultKey->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Home));
 
-	s_kgpgEditor = new KgpgEditor(parent, imodel, Qt::Dialog, \
goToDefaultKey->shortcut(), true); +	s_kgpgEditor = new KgpgEditor(this, imodel, \
Qt::Dialog, goToDefaultKey->shortcut());  \
s_kgpgEditor->setAttribute(Qt::WA_DeleteOnClose, false);  
 	// this must come after kserver, preferences, and openEditor are created
@@ -2637,7 +2637,6 @@
 	}
 
 	KgpgEditor *kgpgtxtedit = new KgpgEditor(this, imodel, 0, \
                goToDefaultKey->shortcut());
-	kgpgtxtedit->setAttribute(Qt::WA_DeleteOnClose);
 	connect(this, SIGNAL(fontChanged(QFont)), kgpgtxtedit, SLOT(slotSetFont(QFont)));
 	kgpgtxtedit->view->editor->setPlainText(cliptext);
 	kgpgtxtedit->view->slotDecode();
@@ -2655,7 +2654,6 @@
 	}
 
 	KgpgEditor *kgpgtxtedit = new KgpgEditor(this, imodel, 0, \
                goToDefaultKey->shortcut());
-	kgpgtxtedit->setAttribute(Qt::WA_DeleteOnClose);
 	connect(kgpgtxtedit->view, SIGNAL(verifyFinished()), kgpgtxtedit, \
SLOT(closeWindow()));  
 	kgpgtxtedit->view->slotSignVerify(cliptext);
--- branches/KDE/4.3/kdeutils/kgpg/kgpgexternalactions.cpp #1031304:1031305
@@ -368,7 +368,7 @@
 
 void KGpgExternalActions::showDroppedFile()
 {
-	KgpgEditor *kgpgtxtedit = new KgpgEditor(0, m_model, 0, goDefaultKey);
+	KgpgEditor *kgpgtxtedit = new KgpgEditor(m_keysmanager, m_model, 0, goDefaultKey);
 	kgpgtxtedit->setAttribute(Qt::WA_DeleteOnClose);
 	kgpgtxtedit->view->editor->slotDroppedFile(droppedUrls.first());
 


[prev in list] [next in list] [prev in thread] [next in thread]