From: <su...@us...> - 2007-10-04 07:41:10
|
Revision: 2187 http://tora.svn.sourceforge.net/tora/?rev=2187&view=rev Author: subik Date: 2007-10-04 00:41:12 -0700 (Thu, 04 Oct 2007) Log Message: ----------- gui qt4 fixes Modified Paths: -------------- branches/tora-1.4/tora/src/tosecurity.cpp Modified: branches/tora-1.4/tora/src/tosecurity.cpp =================================================================== --- branches/tora-1.4/tora/src/tosecurity.cpp 2007-10-04 00:48:39 UTC (rev 2186) +++ branches/tora-1.4/tora/src/tosecurity.cpp 2007-10-04 07:41:12 UTC (rev 2187) @@ -70,6 +70,9 @@ // #include "tosecurityquotaui.moc" // #include "tosecurityroleui.moc" // #include "tosecurityuserui.moc" +#include "ui_tosecurityquotaui.h" +#include "ui_tosecurityuserui.h" +#include "ui_tosecurityroleui.h" #include "icons/addrole.xpm" #include "icons/adduser.xpm" @@ -199,7 +202,7 @@ static toSecurityTool SecurityTool; -class toSecurityQuota : public toSecurityQuotaUI +class toSecurityQuota : public QWidget, public Ui::toSecurityQuotaUI { Q3ListViewItem *CurrentItem; void clearItem(Q3ListViewItem *item); @@ -237,8 +240,9 @@ } toSecurityQuota::toSecurityQuota(QWidget *parent) - : toSecurityQuotaUI(parent) + : QWidget(parent) { + setupUi(this); CurrentItem = NULL; update(); } @@ -384,7 +388,7 @@ } }; -class toSecurityUser : public toSecurityUserUI +class toSecurityUser : public QWidget, public Ui::toSecurityUserUI { toConnection &Connection; @@ -505,8 +509,9 @@ } toSecurityUser::toSecurityUser(toSecurityQuota *quota, toConnection &conn, QWidget *parent) - : toSecurityUserUI(parent), Connection(conn), Quota(quota) + : QWidget(parent), Connection(conn), Quota(quota) { + setupUi(this); Name->setValidator(new toSecurityUpper(Name)); setFocusProxy(Name); try @@ -640,7 +645,7 @@ TOCATCH } -class toSecurityRole : public toSecurityRoleUI +class toSecurityRole : public QWidget, public Ui::toSecurityRoleUI { toConnection &Connection; toSecurityQuota *Quota; @@ -652,8 +657,9 @@ } AuthType; public: toSecurityRole(toSecurityQuota *quota, toConnection &conn, QWidget *parent) - : toSecurityRoleUI(parent), Connection(conn), Quota(quota) + : QWidget(parent), Connection(conn), Quota(quota) { + setupUi(this); Name->setValidator(new toSecurityUpper(Name)); setFocusProxy(Name); } @@ -1549,7 +1555,7 @@ toolbar->setStretchableWidget(new QLabel(toolbar, TO_TOOLBAR_WIDGET_NAME)); new toChangeConnection(toolbar, TO_TOOLBAR_WIDGET_NAME); - QSplitter *splitter = new QSplitter(Horizontal, this); + QSplitter *splitter = new QSplitter(Qt::Horizontal, this); UserList = new toListView(splitter); UserList->addColumn(tr("Users/Roles")); UserList->setSQLName(QString::fromLatin1("toSecurity:Users/Roles")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |