aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/kvirc/ui/kvi_selectors.cpp7
-rw-r--r--src/kvirc/ui/kvi_selectors.h10
-rw-r--r--src/modules/objects/CMakeLists.txt2
3 files changed, 8 insertions, 11 deletions
diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp
index cad878b13..19e2b9db5 100644
--- a/src/kvirc/ui/kvi_selectors.cpp
+++ b/src/kvirc/ui/kvi_selectors.cpp
@@ -452,10 +452,11 @@ KviDirectorySelector::KviDirectorySelector(QWidget * par,const QString & txt,QSt
void KviDirectorySelector::select()
{
- QString tmp;
- if(KviFileDialog::askForDirectoryName(tmp,__tr2qs("Choose a Directory - KVIrc"),""))
+ QString szTmp;
+ if(KviFileDialog::askForDirectoryName(szTmp,__tr2qs("Choose a Directory - KVIrc"),""))
{
- m_pLineEdit->setText(tmp);
+ m_pLineEdit->setText(szTmp);
+ emit selectionChanged(szTmp);
}
}
diff --git a/src/kvirc/ui/kvi_selectors.h b/src/kvirc/ui/kvi_selectors.h
index b5934dadc..1fec3336b 100644
--- a/src/kvirc/ui/kvi_selectors.h
+++ b/src/kvirc/ui/kvi_selectors.h
@@ -210,7 +210,7 @@ public slots:
class KVIRC_API KviFileSelector : public KviTalHBox, public KviSelectorInterface
{
Q_OBJECT
- Q_PROPERTY(QString file READ file WRITE setFile)
+ Q_PROPERTY(QString tmpFile READ tmpFile WRITE setTmpFile)
public:
KviFileSelector(QWidget * par,const QString & txt,QString * pOption,bool bEnabled,unsigned int uFlags = 0,const QString &szFilter = QString());
~KviFileSelector(){};
@@ -227,8 +227,8 @@ protected:
unsigned int m_uFlags;
QString m_szFilter;
public:
- QString file(){ return *m_pOption; };
- void setFile(QString & szFile){ *m_pOption = szFile; };
+ QString tmpFile(){ return m_pLineEdit->text(); };
+ void setTmpFile(QString & szFile){ m_pLineEdit->setText(szFile); };
virtual void commit();
void setSelection(const QString &szSelection);
signals:
@@ -244,13 +244,9 @@ protected:
class KVIRC_API KviDirectorySelector : public KviFileSelector
{
Q_OBJECT
- Q_PROPERTY(QString dir READ dir WRITE setDir)
public:
KviDirectorySelector(QWidget * par,const QString & txt,QString * pOption,bool bEnabled);
~KviDirectorySelector(){};
-public:
- QString dir(){ return *m_pOption; };
- void setDir(QString szDir){ *m_pOption = szDir; };
protected:
virtual void select();
};
diff --git a/src/modules/objects/CMakeLists.txt b/src/modules/objects/CMakeLists.txt
index 65c8b466b..43d89f567 100644
--- a/src/modules/objects/CMakeLists.txt
+++ b/src/modules/objects/CMakeLists.txt
@@ -69,6 +69,7 @@ SET(kviobjects_SRCS
class_slider.cpp
class_socket.cpp
class_spinbox.cpp
+ class_sql.cpp
class_tabwidget.cpp
class_tablewidget.cpp
class_tbrowser.cpp
@@ -83,7 +84,6 @@ SET(kviobjects_SRCS
class_workspace.cpp
class_wrapper.cpp
class_xmlreader.cpp
- class_sql.cpp
)
# After this call, files will be moc'ed to moc_kvi_*.cpp