[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice/filters/kspread/csv
From: Stefan Nikolaus <nikolaus.kde () googlemail ! com>
Date: 2010-06-26 9:14:04
Message-ID: 20100626091404.A57FAAC8DF () svn ! kde ! org
[Download RAW message or body]
SVN commit 1143011 by nikolaus:
Cleanup Port to Qt4.
M +2 -4 CMakeLists.txt
M +20 -40 csvexportdialog.cpp
M +25 -40 exportdialogui.ui
--- trunk/koffice/filters/kspread/csv/CMakeLists.txt #1143010:1143011
@@ -1,14 +1,12 @@
include_directories(${CMAKE_SOURCE_DIR}/kspread ${KOMAIN_INCLUDES})
-add_definitions(-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
-
########### next target ###############
set(csvimport_PART_SRCS csvimport.cc)
kde4_add_plugin(csvimport WITH_PREFIX ${csvimport_PART_SRCS})
-target_link_libraries(csvimport kspreadcommon kowidgets ${QT_QT3SUPPORT_LIBRARY})
+target_link_libraries(csvimport kspreadcommon kowidgets)
install(TARGETS csvimport DESTINATION ${PLUGIN_INSTALL_DIR})
@@ -20,7 +18,7 @@
kde4_add_plugin(csvexport WITH_PREFIX ${csvexport_PART_SRCS})
-target_link_libraries(csvexport kspreadcommon ${QT_QT3SUPPORT_LIBRARY})
+target_link_libraries(csvexport kspreadcommon)
install(TARGETS csvexport DESTINATION ${PLUGIN_INSTALL_DIR})
--- trunk/koffice/filters/kspread/csv/csvexportdialog.cpp #1143010:1143011
@@ -18,33 +18,18 @@
* Boston, MA 02110-1301, USA.
*/
-#include <csvexportdialog.h>
+#include "csvexportdialog.h"
-#include <kspread/Map.h>
-#include <kspread/Sheet.h>
+#include "kspread/Map.h"
+#include "kspread/Sheet.h"
-#include <q3buttongroup.h>
-#include <QCheckBox>
-#include <QComboBox>
-#include <QCursor>
-#include <QLabel>
-#include <QLineEdit>
-#include <q3listview.h>
-#include <QList>
-#include <QRadioButton>
-#include <QTextStream>
-#include <QTabWidget>
+#include <KApplication>
+#include <KCharsets>
+#include <KMessageBox>
+
#include <QTextCodec>
#include <QValidator>
-#include <kapplication.h>
-#include <kconfig.h>
-#include <klocale.h>
-#include <kdebug.h>
-#include <kcombobox.h>
-#include <kmessagebox.h>
-#include <kcharsets.h>
-
using namespace KSpread;
CSVExportDialog::CSVExportDialog(QWidget * parent)
@@ -158,19 +143,13 @@
void CSVExportDialog::fillSheet(Map * map)
{
m_dialog->m_sheetList->clear();
- Q3CheckListItem * item;
+ QListWidgetItem *item;
foreach(Sheet* sheet, map->sheetList()) {
- item = new Q3CheckListItem(m_dialog->m_sheetList,
- sheet->sheetName(),
- Q3CheckListItem::CheckBox);
- item->setOn(true);
- m_dialog->m_sheetList->insertItem(item);
+ item = new QListWidgetItem(sheet->sheetName() ,m_dialog->m_sheetList);
+ item->setCheckState(Qt::Checked);
+ m_dialog->m_sheetList->addItem(item);
}
-
- m_dialog->m_sheetList->setSorting(0, true);
- m_dialog->m_sheetList->sort();
- m_dialog->m_sheetList->setSorting(-1);
}
QChar CSVExportDialog::getDelimiter() const
@@ -195,12 +174,14 @@
bool CSVExportDialog::exportSheet(QString const & sheetName) const
{
- for (Q3ListViewItem * item = m_dialog->m_sheetList->firstChild(); item; item = \
item->nextSibling()) {
- if (((Q3CheckListItem *) item)->isOn()) {
- if (((Q3CheckListItem *) item)->text() == sheetName)
+ for (int i = 0; i < m_dialog->m_sheetList->count(); ++i) {
+ QListWidgetItem *const item = m_dialog->m_sheetList->item(i);
+ if (item->checkState() == Qt::Checked) {
+ if (item->text() == sheetName) {
return true;
}
}
+ }
return false;
}
@@ -216,7 +197,7 @@
void CSVExportDialog::returnPressed()
{
- if (m_dialog->m_delimiterBox->id(m_dialog->m_delimiterBox->selected()) != 4)
+ if (!m_dialog->m_radioOther->isChecked())
return;
m_delimiter = m_dialog->m_delimiterEdit->text();
@@ -312,11 +293,11 @@
QString CSVExportDialog::getEndOfLine(void) const
{
QString strReturn;
- if (m_dialog->radioEndOfLineLF == m_dialog->buttonGroupEndOfLine->selected())
+ if (m_dialog->radioEndOfLineLF->isChecked())
strReturn = "\n";
- else if (m_dialog->radioEndOfLineCRLF == \
m_dialog->buttonGroupEndOfLine->selected()) + else if \
(m_dialog->radioEndOfLineCRLF->isChecked()) strReturn = "\r\n";
- else if (m_dialog->radioEndOfLineCR == \
m_dialog->buttonGroupEndOfLine->selected()) + else if \
(m_dialog->radioEndOfLineCR->isChecked()) strReturn = "\r";
else
strReturn = "\n";
@@ -325,4 +306,3 @@
}
#include "csvexportdialog.moc"
-
--- trunk/koffice/filters/kspread/csv/exportdialogui.ui #1143010:1143011
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0" >
<class>ExportDialogUI</class>
<widget class="QWidget" name="ExportDialogUI" >
@@ -13,7 +14,7 @@
<item row="1" column="0" >
<widget class="QTabWidget" name="m_tabWidget" >
<property name="sizePolicy" >
- <sizepolicy vsizetype="Expanding" hsizetype="Minimum" >
+ <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -59,7 +60,7 @@
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>106</width>
<height>20</height>
@@ -70,7 +71,7 @@
</layout>
</item>
<item>
- <widget class="Q3ButtonGroup" name="buttonGroupEndOfLine" >
+ <widget class="QGroupBox" name="buttonGroupEndOfLine">
<property name="title" >
<string>End of Line</string>
</property>
@@ -116,7 +117,7 @@
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>96</height>
@@ -132,12 +133,10 @@
</attribute>
<layout class="QGridLayout" >
<item row="2" column="0" >
- <widget class="Q3ListView" name="m_sheetList" >
- <column>
- <property name="text" >
- <string>Available Sheets</string>
+ <widget class="QListWidget" name="m_sheetList">
+ <property name="sortingEnabled">
+ <bool>true</bool>
</property>
- </column>
</widget>
</item>
<item row="1" column="0" >
@@ -153,7 +152,7 @@
<item row="0" column="0" >
<widget class="QGroupBox" name="m_delimiterLineBox" >
<property name="sizePolicy" >
- <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -165,20 +164,20 @@
<item row="0" column="0" >
<widget class="QLineEdit" name="m_sheetDelimiter" >
<property name="text" >
- <string>********<SHEETNAME>********</string>
+ <string>********<SHEETNAME>********</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="TextLabel6" >
<property name="sizePolicy" >
- <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
- <string><SHEETNAME> gets replaced by the name of the next \
sheet.</string> + <string><SHEETNAME> gets replaced by the name of \
the next sheet.</string> </property>
<property name="alignment" >
<set>Qt::AlignVCenter</set>
@@ -191,7 +190,7 @@
<item row="2" column="0" >
<widget class="QCheckBox" name="m_delimiterAboveAll" >
<property name="sizePolicy" >
- <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -212,9 +211,9 @@
</attribute>
<layout class="QGridLayout" >
<item row="0" column="0" >
- <widget class="Q3ButtonGroup" name="m_delimiterBox" >
+ <widget class="KButtonGroup" name="m_delimiterBox">
<property name="sizePolicy" >
- <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -264,7 +263,7 @@
<item row="1" column="2" >
<widget class="QLineEdit" name="m_delimiterEdit" >
<property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -286,7 +285,7 @@
<item row="0" column="1" >
<widget class="QGroupBox" name="GroupBox1" >
<property name="sizePolicy" >
- <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -301,7 +300,7 @@
<bool>true</bool>
</property>
<property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -320,14 +319,14 @@
<bool>true</bool>
</property>
<property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text" >
- <string>"</string>
+ <string>"</string>
</property>
</item>
<item>
@@ -348,7 +347,7 @@
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>406</width>
<height>121</height>
@@ -361,12 +360,6 @@
</widget>
</item>
<item row="0" column="0" >
- <widget class="Q3ButtonGroup" name="buttonGroup2" >
- <property name="title" >
- <string/>
- </property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
<widget class="QCheckBox" name="m_selectionOnly" >
<property name="text" >
<string>Export selection only</string>
@@ -375,22 +368,14 @@
</item>
</layout>
</widget>
- </item>
- </layout>
- </widget>
<customwidgets>
<customwidget>
- <class>Q3ButtonGroup</class>
- <extends>Q3GroupBox</extends>
- <header>Qt3Support/Q3ButtonGroup</header>
+ <class>KButtonGroup</class>
+ <extends>QGroupBox</extends>
+ <header>kbuttongroup.h</header>
<container>1</container>
</customwidget>
<customwidget>
- <class>Q3ListView</class>
- <extends>QFrame</extends>
- <header>q3listview.h</header>
- </customwidget>
- <customwidget>
<class>KComboBox</class>
<extends>QComboBox</extends>
<header>kcombobox.h</header>
@@ -398,7 +383,7 @@
</customwidgets>
<includes>
<include location="local" >kcombobox.h</include>
- <include location="local" >klineedit.h</include>
+ <include location="local">kbuttongroup.h</include>
</includes>
<resources/>
<connections/>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic