[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/kexi (silent)
From:       Jarosław Staniek <staniek () kde ! org>
Date:       2010-02-20 18:10:20
Message-ID: 1266689420.359981.16155.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1093372 by staniek:

Use QString() instead of "", and use QString::clear()
SVN_SILENT


 M  +2 -2      koproperty/Property.cpp  
 M  +1 -1      koproperty/Set.cpp  
 M  +2 -2      koproperty/test/test.cpp  
 M  +1 -1      main/KexiMainWindow.cpp  
 M  +1 -1      main/KexiMainWindow_p.h  
 M  +1 -1      main/kexinamewidget.cpp  
 M  +2 -2      main/startup/KexiNewProjectWizard.cpp  
 M  +2 -2      main/startup/KexiStartup.cpp  
 M  +1 -1      widget/KexiProjectListView.cpp  
 M  +1 -1      widget/kexidbconnectionwidget.cpp  
 M  +2 -2      widget/kexidbconnectionwidget.h  
 M  +1 -1      widget/pixmapcollection.cpp  
 M  +2 -2      widget/tableview/kexitableviewheader.cpp  


--- trunk/koffice/kexi/koproperty/Property.cpp #1093371:1093372
@@ -701,8 +701,8 @@
 //        prop->setSortingKey(d->children->count());
         prop->d->parent = this;
     } else {
-        kWarning() << "property \"" << name()
-                << "\": child property \"" << prop->name() << "\" already added";
+        kWarning() << "property" << name()
+                << ": child property" << prop->name() << "already added";
         return;
     }
 }
--- trunk/koffice/kexi/koproperty/Set.cpp #1093371:1093372
@@ -62,7 +62,7 @@
         if (p)
             return *p;
         Set_nonConstNull.setName(0); //to ensure returned property is null
-        kWarning() << "PROPERTY \"" << name << "\" NOT FOUND";
+        kWarning() << "PROPERTY" << name << "NOT FOUND";
         return Set_nonConstNull;
     }
 
--- trunk/koffice/kexi/koproperty/test/test.cpp #1093371:1093372
@@ -74,7 +74,7 @@
         m_set.addProperty(new Property("Bool", QVariant(true), "Bool"), group);
     }
     if (singleProperty.isEmpty() || singleProperty=="3-State") {
-        m_set.addProperty(p = new Property("3-State", QVariant(), "3 States", "", Bool), group);
+        m_set.addProperty(p = new Property("3-State", QVariant(), "3 States", QString(), Bool), group);
         p->setOption("3State", true);
     }
     if (singleProperty.isEmpty() || singleProperty=="Date") {
@@ -153,7 +153,7 @@
         m_set.addProperty(new Property("Cursor", QCursor(Qt::WaitCursor), "Cursor"), group);
     }
     if (singleProperty.isEmpty() || singleProperty=="LineStyle") {
-        m_set.addProperty(new Property("LineStyle", 3, "Line Style", "", LineStyle), group);
+        m_set.addProperty(new Property("LineStyle", 3, "Line Style", QString(), LineStyle), group);
     }
     if (singleProperty.isEmpty() || singleProperty=="SizePolicy") {
         QSizePolicy sp(sizePolicy());
--- trunk/koffice/kexi/main/KexiMainWindow.cpp #1093371:1093372
@@ -2288,7 +2288,7 @@
 {
 //! @todo allow to set custom "static" app caption
 
-    d->appCaptionPrefix = "";
+    d->appCaptionPrefix.clear();
     if (d->prj && d->prj->data()) {//add project name
         d->appCaptionPrefix = d->prj->data()->caption();
         if (d->appCaptionPrefix.isEmpty())
--- trunk/koffice/kexi/main/KexiMainWindow_p.h #1093371:1093372
@@ -573,7 +573,7 @@
         wasAutoOpen = false;
         windowExistedBeforeCloseProject = false;
 #ifndef KEXI_SHOW_UNIMPLEMENTED
-        dummy_action = new KActionMenu("", wnd);
+        dummy_action = new KActionMenu(QString(), wnd);
 #endif
         maximizeFirstOpenedChildFrm = false;
 #ifdef HAVE_KNEWSTUFF
--- trunk/koffice/kexi/main/kexinamewidget.cpp #1093371:1093372
@@ -173,7 +173,7 @@
 void KexiNameWidget::setMessageText(const QString& msg)
 {
     if (msg.trimmed().isEmpty()) {
-        lbl_message->setText("");
+        lbl_message->setText(QString());
         lbl_message->hide();
     } else {
         lbl_message->setText(msg.trimmed() + "<br>");
--- trunk/koffice/kexi/main/startup/KexiNewProjectWizard.cpp #1093371:1093372
@@ -309,7 +309,7 @@
     if (currentPage() == m_db_title) { //pg 2
         if (m_db_title->le_caption->text().trimmed().isEmpty()) {
             KMessageBox::information(this, i18n("Enter project caption."));
-            m_db_title->le_caption->setText("");
+            m_db_title->le_caption->setText(QString());
             m_db_title->le_caption->setFocus();
             return;
         }
@@ -354,7 +354,7 @@
         QString dbname = m_server_db_name->le_dbname->text().trimmed();
         if (dbname.isEmpty()) {
             KMessageBox::information(this, i18n("Enter project's database name."));
-            m_server_db_name->le_dbname->setText("");
+            m_server_db_name->le_dbname->setText(QString());
             m_server_db_name->le_dbname->setFocus();
             return;
         }
--- trunk/koffice/kexi/main/startup/KexiStartup.cpp #1093371:1093372
@@ -121,7 +121,7 @@
             int j = 0;
 //   char *q=++p;
             ++i;
-            line = "";
+            line.clear();
             for (;i<buflen && *p >= '0' && *p <= '9'; j++, i++, p++)
                 line += *p;
             --i; --p;
@@ -230,7 +230,7 @@
         int idx;
         bool name_required = true;
         if (action_name == "new") {
-            obj_name = "";
+            obj_name.clear();
             stripQuotes(item, type_name);
             name_required = false;
         } else {//open, design, text...
--- trunk/koffice/kexi/widget/KexiProjectListView.cpp #1093371:1093372
@@ -101,7 +101,7 @@
     slotSettingsChanged(0);
 
     m_list->header()->hide();
-    m_list->addColumn("");
+    m_list->addColumn(QString());
     m_list->setShowToolTips(true);
     m_list->setSorting(0);
     m_list->sort();
--- trunk/koffice/kexi/widget/kexidbconnectionwidget.cpp #1093371:1093372
@@ -99,7 +99,7 @@
 
     d->btnTestConnection = new KPushButton(
 // @todo add Test Connection icon
-        KGuiItem(i18n("&Test Connection"), "",
+        KGuiItem(i18n("&Test Connection"), QString(),
                  i18n("Test database connection"),
                  i18n("Tests database connection. "
                       "You can ensure that valid connection information is provided.")),
--- trunk/koffice/kexi/widget/kexidbconnectionwidget.h #1093371:1093372
@@ -150,7 +150,7 @@
      \a acceptButtonGuiItem allows to override default "Open" button's appearance. */
     KexiDBConnectionDialog(QWidget* parent, const KexiProjectData& data,
                            const QString& shortcutFileName = QString(),
-                           const KGuiItem& acceptButtonGuiItem = KGuiItem(""));
+                           const KGuiItem& acceptButtonGuiItem = KGuiItem());
 
     /*! Creates a new connection dialog for connection data \a data.
      Only connection data is visible: database name and and title fields are hidden.
@@ -160,7 +160,7 @@
      See above constructor for more details. */
     KexiDBConnectionDialog(QWidget* parent, const KexiDB::ConnectionData& data,
                            const QString& shortcutFileName = QString(),
-                           const KGuiItem& acceptButtonGuiItem = KGuiItem(""));
+                           const KGuiItem& acceptButtonGuiItem = KGuiItem());
 
     ~KexiDBConnectionDialog();
 
--- trunk/koffice/kexi/widget/pixmapcollection.cpp #1093371:1093372
@@ -399,7 +399,7 @@
 QString
 PixmapCollectionChooser::pixmapName()
 {
-    return m_iconView->currentItem() ? m_iconView->currentItem()->text() : QString("");
+    return m_iconView->currentItem() ? m_iconView->currentItem()->text() : QString();
 }
 
 QPixmap
--- trunk/koffice/kexi/widget/tableview/kexitableviewheader.cpp #1093371:1093372
@@ -110,14 +110,14 @@
 
 int KexiTableViewHeader::addLabel(const QString & s, int size)
 {
-    m_toolTips += "";
+    //m_toolTips += "";
     slotSizeChange(0, 0, 0);//refresh
     return Q3Header::addLabel(s, size);
 }
 
 int KexiTableViewHeader::addLabel(const QIcon & icon, const QString & s, int size)
 {
-    m_toolTips += "";
+    //m_toolTips += "";
     slotSizeChange(0, 0, 0);//refresh
     return Q3Header::addLabel(icon, s, size);
 }
[prev in list] [next in list] [prev in thread] [next in thread]