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

[Andrew Walker]

SVN commit 1120749 by arwalker:

continue kst1kde4

 M  +2 -2      CMakeLists.txt  
 M  +2 -1      kstpluginmanager.cpp  
 M  +6 -12     kstviewlegendwidget.cpp  
 M  +2 -0      kstviewlegendwidget.h  


--- branches/work/kst/kst1kde4/kst/src/libkstapp/CMakeLists.txt #1120748:1120749
@@ -114,7 +114,7 @@
 #    kstiface.h
 #    kstiface_impl.h)
 
-kde4_add_ui_files(kstapp_LIB_SRCS
+qt4_wrap_ui(kstapp_UI_HDRS
     basicdialogwidget.ui
     changefiledialog.ui
     changenptsdialog.ui
@@ -156,7 +156,7 @@
     viewstringsdialog.ui
     viewvectorsdialog.ui)
 
-kde4_add_library(kstapp SHARED ${kstapp_LIB_SRCS})
+kde4_add_library(kstapp SHARED ${kstapp_LIB_SRCS} ${kstapp_UI_HDRS})
 
 target_link_libraries(kstapp kstbase kstmath kstwidgets ${KDE4_KDECORE_LIBS} QtXml QtGui)
 
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstpluginmanager.cpp #1120748:1120749
@@ -17,13 +17,14 @@
 
 #include <QCheckBox>
 #include <QComboBox>
+#include <QFileDialog>
 #include <QImage>
 #include <QLabel>
 #include <QListView>
 #include <QMessageBox>
 #include <QRadioButton>
 #include <QRegExp>
-#include <QFileDialog>
+#include <QUrl>
 
 #include "kstpluginmanager.h"
 #include "plugincollection.h"
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstviewlegendwidget.cpp #1120748:1120749
@@ -20,8 +20,7 @@
 #include "kst_export.h"
 #include "kstviewlegendwidget.h"
 
-KstViewLegendWidget::KstViewLegendWidget(QWidget* parent, const char* name, Qt::WindowFlags fl) : QDialog(parent, fl)
-{ 
+KstViewLegendWidget::KstViewLegendWidget(QWidget* parent, const char* name, Qt::WindowFlags fl) : QDialog(parent, fl) {
   setupUi(this);
 
   connect(DisplayedCurveList, SIGNAL(clicked(QListBoxItem*)), this, SLOT(updateButtons()));
@@ -60,8 +59,7 @@
 }
 
 
-void KstViewLegendWidget::updateButtons()
-{
+void KstViewLegendWidget::updateButtons() {
   bool selected = false;
   uint count = AvailableCurveList->count();
   uint i;
@@ -103,8 +101,7 @@
 }
 
 
-void KstViewLegendWidget::removeDisplayedCurve()
-{
+void KstViewLegendWidget::removeDisplayedCurve() {
   uint count = DisplayedCurveList->count();
 
   if (count > 0) {
@@ -123,8 +120,7 @@
 }
 
 
-void KstViewLegendWidget::addDisplayedCurve()
-{
+void KstViewLegendWidget::addDisplayedCurve() {
   uint count = AvailableCurveList->count();
 
   if (count > 0) {
@@ -143,14 +139,12 @@
 }
 
 
-void KstViewLegendWidget::changedFgColor( )
-{
+void KstViewLegendWidget::changedFgColor( ) {
   _changedFgColor = true;
 }
 
 
-void KstViewLegendWidget::changedBgColor( )
-{
+void KstViewLegendWidget::changedBgColor( ) {
   _changedBgColor = true;
 }
 
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstviewlegendwidget.h #1120748:1120749
@@ -18,6 +18,8 @@
 #ifndef KSTVIEWLEGENDWIDGETI_H
 #define KSTVIEWLEGENDWIDGETI_H
 
+#include <QDialog>
+
 #include "kcolorbutton.h"
 #include "klineedit.h"