Use correct type in signal/slot connection.

QLineEdit only has a signal for textChanged with the parameter
QString. The type secstring was not resolved correctly so the
signal/slot connection failed.

diff --git a/ChangeLog b/ChangeLog
index 02c8031..cbdf28e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-12  Andre Heinecke  <aheinecke@intevation.de>
+
+       * pinentrydialog.cpp (PinEntryDialog): Connect signal with standard type
+       * pinentrydialog.cpp (updateQuality): use const QString & to avoid connect
+         problems.
+       * pinentrydialog.h (PinEntryDialog): Change declaration of updateQuality
+         slot
+       * pinentrydialog.moc: Update to reflect signal changes
+
 2010-08-09  Andre Heinecke <aheinecke@intevation.de>
 
        * CMakelists.txt: Disable some Microsoft-CRT deprecation warnings

diff --git a/pinentrydialog.cpp b/pinentrydialog.cpp
index 82956de..869cebd 100644 (file)
--- a/pinentrydialog.cpp
+++ b/pinentrydialog.cpp
@@ -140,8 +140,8 @@ PinEntryDialog::PinEntryDialog( QWidget* parent, const char* name, bool modal,
  
   connect( buttons, SIGNAL(accepted()), this, SLOT(accept()) );
   connect( buttons, SIGNAL(rejected()), this, SLOT(reject()) );
-  connect( _edit, SIGNAL( textChanged(secqstring) ),
-           this, SLOT( updateQuality(secqstring) ) );
+  connect( _edit, SIGNAL( textChanged(const QString &) ),
+           this, SLOT( updateQuality(const QString &) ) );
 
   _edit->setFocus();
 

diff --git a/pinentrydialog.h b/pinentrydialog.h
index 7becc26..8a24aef 100644 (file)
--- a/pinentrydialog.h
+++ b/pinentrydialog.h
@@ -79,7 +79,7 @@ public:
   void setPinentryInfo (pinentry_t);
 
 public slots:
-  void updateQuality(const secqstring&);
+  void updateQuality(const QString&);
 
 protected:
   /* reimp */ void showEvent( QShowEvent* event );

diff --git a/pinentrydialog.moc b/pinentrydialog.moc
index c9a0930..6d5c9e9 100644 (file)
--- a/pinentrydialog.moc
+++ b/pinentrydialog.moc
@@ -1,8 +1,8 @@
 /****************************************************************************
 ** Meta object code from reading C++ file 'pinentrydialog.h'
 **
-** Created: Mon Mar 16 13:03:03 2009
-**      by: The Qt Meta Object Compiler version 59 (Qt 4.4.1)
+** Created: Wed Aug 11 16:38:30 2010
+**      by: The Qt Meta Object Compiler version 62 (Qt 4.8.0)
 **
 ** WARNING! All changes made in this file will be lost!
 *****************************************************************************/
@@ -10,8 +10,8 @@
 #include "pinentrydialog.h"
 #if !defined(Q_MOC_OUTPUT_REVISION)
 #error "The header file 'pinentrydialog.h' doesn't include <QObject>."
-#elif Q_MOC_OUTPUT_REVISION < 59
-#error "This file was generated using the moc from 4.4.1. It"
+#elif Q_MOC_OUTPUT_REVISION != 62
+#error "This file was generated using the moc from 4.8.0. It"
 #error "cannot be used with the include files from this version of Qt."
 #error "(The moc has changed too much.)"
 #endif
@@ -20,27 +20,30 @@ QT_BEGIN_MOC_NAMESPACE
 static const uint qt_meta_data_PinEntryDialog[] = {
 
  // content:
-       1,       // revision
+       5,       // revision
        0,       // classname
        0,    0, // classinfo
-       1,   10, // methods
-       4,   15, // properties
+       1,   14, // methods
+       4,   19, // properties
        0,    0, // enums/sets
+       0,    0, // constructors
+       0,       // flags
+       0,       // signalCount
 
  // slots: signature, parameters, type, tag, flags
       16,   15,   15,   15, 0x0a,
 
  // properties: name, type, flags
-      50,   42, 0x0a095103,
-      62,   42, 0x0a095103,
-      79,   68, 0x0009510b,
-      83,   42, 0x0a095103,
+      47,   39, 0x0a095103,
+      59,   39, 0x0a095103,
+      76,   65, 0x0009510b,
+      80,   39, 0x0a095103,
 
        0        // eod
 };
 
 static const char qt_meta_stringdata_PinEntryDialog[] = {
-    "PinEntryDialog\0\0updateQuality(secqstring)\0"
+    "PinEntryDialog\0\0updateQuality(QString)\0"
     "QString\0description\0error\0secqstring\0"
     "pin\0prompt\0"
 };
@@ -50,9 +53,13 @@ const QMetaObject PinEntryDialog::staticMetaObject = {
       qt_meta_data_PinEntryDialog, 0 }
 };
 
+#ifdef Q_NO_DATA_RELOCATION
+const QMetaObject &PinEntryDialog::getStaticMetaObject() { return staticMetaObject; }
+#endif //Q_NO_DATA_RELOCATION
+
 const QMetaObject *PinEntryDialog::metaObject() const
 {
-    return &staticMetaObject;
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
 }
 
 void *PinEntryDialog::qt_metacast(const char *_clname)
@@ -70,7 +77,8 @@ int PinEntryDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
         return _id;
     if (_c == QMetaObject::InvokeMetaMethod) {
         switch (_id) {
-        case 0: updateQuality((*reinterpret_cast< const secqstring(*)>(_a[1]))); break;
+        case 0: updateQuality((*reinterpret_cast< const QString(*)>(_a[1]))); break;
+        default: ;
         }
         _id -= 1;
     }