[Tora-cvs] SF.net SVN: tora: [2171] branches/tora-1.4/tora

[<su...@us...>]

Revision: 2171
          http://tora.svn.sourceforge.net/tora/?rev=2171&view=rev
Author:   subik
Date:     2007-09-26 06:58:35 -0700 (Wed, 26 Sep 2007)

Log Message:
-----------
plugin dir defined + more Qt4 port

Modified Paths:
--------------
    branches/tora-1.4/tora/CMakeLists.txt
    branches/tora-1.4/tora/src/toalert.cpp
    branches/tora-1.4/tora/src/toinvalid.cpp
    branches/tora-1.4/tora/src/toresultcombo.cpp
    branches/tora-1.4/tora/src/totableselect.cpp

Modified: branches/tora-1.4/tora/CMakeLists.txt
===================================================================
--- branches/tora-1.4/tora/CMakeLists.txt	2007-09-26 13:49:10 UTC (rev 2170)
+++ branches/tora-1.4/tora/CMakeLists.txt	2007-09-26 13:58:35 UTC (rev 2171)
@@ -48,6 +48,7 @@
 
 #Set the permissions to be used when installing plugins
 SET(PLUGIN_PERMISSIONS WORLD_EXECUTE GROUP_EXECUTE OWNER_EXECUTE WORLD_READ GROUP_READ OWNER_READ OWNER_WRITE)
+ADD_DEFINITIONS("-DDEFAULT_PLUGIN_DIR=\\\"${CMAKE_INSTALL_PREFIX}/lib/tora\\\"")
 
 #Our main directory is scribus
 SET(MAIN_DIR_NAME "src")

Modified: branches/tora-1.4/tora/src/toalert.cpp
===================================================================
--- branches/tora-1.4/tora/src/toalert.cpp	2007-09-26 13:49:10 UTC (rev 2170)
+++ branches/tora-1.4/tora/src/toalert.cpp	2007-09-26 13:58:35 UTC (rev 2171)
@@ -398,7 +398,7 @@
     {
         toLocker lock (Lock)
             ;
-        if (Error)
+        if (!Error.isNull())
         {
             toStatusMessage(Error);
             Error = QString::null;

Modified: branches/tora-1.4/tora/src/toinvalid.cpp
===================================================================
--- branches/tora-1.4/tora/src/toinvalid.cpp	2007-09-26 13:49:10 UTC (rev 2170)
+++ branches/tora-1.4/tora/src/toinvalid.cpp	2007-09-26 13:58:35 UTC (rev 2171)
@@ -131,7 +131,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);
 
     Objects = new toResultLong(false, false, toQuery::Background, splitter);
     Objects->setSQL(SQLListInvalid);

Modified: branches/tora-1.4/tora/src/toresultcombo.cpp
===================================================================
--- branches/tora-1.4/tora/src/toresultcombo.cpp	2007-09-26 13:49:10 UTC (rev 2170)
+++ branches/tora-1.4/tora/src/toresultcombo.cpp	2007-09-26 13:58:35 UTC (rev 2171)
@@ -55,7 +55,7 @@
 }
 
 toResultCombo::~toResultCombo()
-{    
+{
 }
 
 void toResultCombo::query(const QString &sql, const toQList &param)
@@ -67,7 +67,7 @@
     {
         clear();
         insertStringList(Additional);
-        for (unsigned int i = 0;i < Additional.count();i++)
+        for (int i = 0;i < Additional.count();i++)
             if (Additional[i] == Selected)
                 setCurrentItem(i);
 

Modified: branches/tora-1.4/tora/src/totableselect.cpp
===================================================================
--- branches/tora-1.4/tora/src/totableselect.cpp	2007-09-26 13:49:10 UTC (rev 2170)
+++ branches/tora-1.4/tora/src/totableselect.cpp	2007-09-26 13:58:35 UTC (rev 2171)
@@ -11,7 +11,7 @@
 void toTableSelect::setup()
 {
     setTitle(tr("Table selection"));
-    setColumnLayout(1, Vertical);
+    setColumnLayout(1, Qt::Vertical);
     bool mysql = false;
     try
     {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.