[Kst] branches/work/kst/kst1kde4/kst/src/libkstapp

[Zongyi Zhang]

SVN commit 1115588 by zhang:

continue kst1kde4

 M  +1 -1      kstmatrixdialog.cpp  
 M  +3 -1      kstmatrixdialog.h  
 M  +1 -1      kstvectordialog.cpp  
 M  +3 -1      kstvectordialog.h  


--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstmatrixdialog.cpp #1115587:1115588
@@ -1042,7 +1042,7 @@
 
   _w->_configure->setEnabled(_configWidget);
 
-// xxx  _fieldCompletion = _w->_field->completionObject();
+	_w->_field->setCompleter(_fieldCompletion);
 
   _w->_field->insertItems(0, list);
 /* xxx
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstmatrixdialog.h #1115587:1115588
@@ -18,6 +18,8 @@
 #ifndef KSTMATRIXDIALOGI_H
 #define KSTMATRIXDIALOGI_H
 
+#include <QCompleter>
+
 #include "kstdatadialog.h"
 #include "kstrmatrix.h"
 #include "kstsmatrix.h"
@@ -90,7 +92,7 @@
     void cleanup();
     bool editSingleObject(KstMatrixPtr mxPtr);
 
-// xxx    QPointer<KCompletion> _fieldCompletion;
+    QPointer<QCompleter> _fieldCompletion;
     QPointer<KstDataSourceConfigWidget> _configWidget;
 
     static QPointer<KstMatrixDialog> _inst;
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstvectordialog.cpp #1115587:1115588
@@ -247,7 +247,7 @@
 
   _w->_configure->setEnabled(_configWidget);
   _w->_pushButtonHierarchy->setEnabled(_hierarchy);
-// xxx  _fieldCompletion = _w->Field->completionObject();
+  _w->Field->setCompleter(_fieldCompletion);
 
   _w->Field->insertItems(0, list);
 /* xxx
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstvectordialog.h #1115587:1115588
@@ -18,6 +18,8 @@
 #ifndef KSTVECTORDIALOGI_H
 #define KSTVECTORDIALOGI_H
 
+#include <QCompleter>
+
 #include "kstdatadialog.h"
 #include "kst_export.h"
 #include "ui_vectordialogwidget.h"
@@ -73,7 +75,7 @@
 
     static QPointer<KstVectorDialog> _inst;
     static const QString& defaultTag;
-// xxx    QPointer<KCompletion> _fieldCompletion;
+    QPointer<QCompleter> _fieldCompletion;
     QPointer<KstDataSourceConfigWidget> _configWidget;
     Ui::VectorDialogWidget *_w;
     bool _inTest : 1;