'more krazyness'

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

List: koffice-devel
Subject: more krazyness
From: Florian <florianmerz () gmx ! de>
Date: 2008-09-10 17:37:22
Message-ID: 200809101937.23110.florianmerz () gmx ! de
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


Hi everyone,

attached are some more krazy fixes for the libs directory.

Ok to apply?

Greetings,
 Florian

[Attachment #5 (text/html)]

<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" \
"http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" \
content="1" /><style type="text/css"> p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; \
font-weight:400; font-style:normal;"> Hi everyone, attached are some more krazy \
fixes for the libs directory. Ok to apply? Greetings, Florian</body></html>


["signal-slot-macros.patch" (text/x-patch)]

Index: libs/main/KoVersionDialog.h
===================================================================

--- libs/main/KoVersionDialog.h	(Revision 859557)
+++ libs/main/KoVersionDialog.h	(Arbeitskopie)
@@ -36,7 +36,7 @@
     KoVersionDialog(QWidget* parent, KoDocument *doc);
     ~KoVersionDialog();
 
-public slots:
+public Q_SLOTS:
     void slotRemove();
     void slotAdd();
     void slotOpen();
Index: libs/main/KoDocumentInfo.h
===================================================================
--- libs/main/KoDocumentInfo.h	(Revision 859557)
+++ libs/main/KoDocumentInfo.h	(Arbeitskopie)
@@ -190,7 +190,7 @@
     QMap<QString, QString> m_aboutInfo;
 
     bool m_firstSave;
-signals:
+Q_SIGNALS:
     void infoUpdated(const QString &info, const QString &data);
 };
 
Index: libs/main/KoMainWindow.h
===================================================================
--- libs/main/KoMainWindow.h	(Revision 859557)
+++ libs/main/KoMainWindow.h	(Arbeitskopie)
@@ -164,7 +164,7 @@
     /// Return the list of dock widgets belonging to this main window.
     QList<QDockWidget*> dockWidgets();
 
-signals:
+Q_SIGNALS:
     /**
      * This signal is emitted if the document has been saved successfully.
      */
@@ -175,7 +175,7 @@
     /// This signal is emitted right after the docker states have been succefully restored from config
     void restoringDone();
 
-public slots:
+public Q_SLOTS:
 
     /**
      * Slot for eMailing the document using KMail
@@ -382,10 +382,10 @@
 
     KRecentFilesAction *recentAction() const;
 
-protected slots:
+protected Q_SLOTS:
     virtual void slotActivePartChanged(KParts::Part *newPart);
 
-private slots:
+private Q_SLOTS:
     void slotLoadCompleted();
     void slotLoadCanceled(const QString &);
     void slotSaveCompleted();
Index: libs/main/KoViewChild.h
===================================================================
--- libs/main/KoViewChild.h	(Revision 859557)
+++ libs/main/KoViewChild.h	(Arbeitskopie)
@@ -43,14 +43,14 @@
 
     void setInitialFrameGeometry();
 
-public slots:
+public Q_SLOTS:
 
     // Call this when the view transformations change
     void reposition() {
         slotDocGeometryChanged();
     }
 
-private slots:
+private Q_SLOTS:
     void slotFrameGeometryChanged();
     void slotDocGeometryChanged();
 
Index: libs/main/KoFilter.h
===================================================================
--- libs/main/KoFilter.h	(Revision 859557)
+++ libs/main/KoFilter.h	(Arbeitskopie)
@@ -83,7 +83,7 @@
      */
     virtual ConversionStatus convert(const QByteArray& from, const QByteArray& to) = 0;
 
-signals:
+Q_SIGNALS:
     /**
      * Emit this signal with a value in the range of 1...100 to have some
      * progress feedback for the user in the statusbar of the application.
Index: libs/main/KoDocumentInfoDlg.h
===================================================================
--- libs/main/KoDocumentInfoDlg.h	(Revision 859557)
+++ libs/main/KoDocumentInfoDlg.h	(Arbeitskopie)
@@ -62,11 +62,11 @@
     /** Returns true if the document was saved when the dialog was closed */
     bool isDocumentSaved();
 
-public slots:
+public Q_SLOTS:
     /** Connected to the okClicked() signal */
     void slotApply();
 
-private slots:
+private Q_SLOTS:
     /** Connected with clicked() from pbReset - Reset parts of the metadata */
     void slotResetMetaData();
     /** Connected with clicked() from pbEncrypt - Toggle the encryption of the document */
Index: libs/main/KoDocument.h
===================================================================
--- libs/main/KoDocument.h	(Revision 859557)
+++ libs/main/KoDocument.h	(Arbeitskopie)
@@ -858,7 +858,7 @@
     using ReadWritePart::localFilePath;
     using ReadWritePart::setLocalFilePath;
 
-public slots:
+public Q_SLOTS:
     /**
      * Initialize an empty document using default values
      */
@@ -893,7 +893,7 @@
      */
     virtual void setDocumentClean(bool clean);
 
-signals:
+Q_SIGNALS:
 
     /**
      * This signal is emitted when the unit is changed by setUnit().
@@ -941,7 +941,7 @@
 
     void closeEmbedInitDialog();
 
-protected slots:
+protected Q_SLOTS:
     /**
      * This slot loads an existing file and deletes the start up widget.
      * @param url the file to load
@@ -1116,7 +1116,7 @@
     KoOpenPane* createOpenPane(QWidget* parent, const KComponentData &instance,
                                const QString& templateType = QString());
 
-private slots:
+private Q_SLOTS:
     void slotChildChanged(KoChild *c);
     void slotChildDestroyed();
     void slotAutoSave();
Index: libs/main/KoFrame.h
===================================================================
--- libs/main/KoFrame.h	(Revision 859557)
+++ libs/main/KoFrame.h	(Arbeitskopie)
@@ -51,7 +51,7 @@
 
     virtual int border() const;
 
-signals:
+Q_SIGNALS:
     void geometryChanged();
 
 protected:
Index: libs/koproperty2/set.h
===================================================================
--- libs/koproperty2/set.h	(Revision 859557)
+++ libs/koproperty2/set.h	(Arbeitskopie)
@@ -200,7 +200,7 @@
      that the set has been cleared (all properties are deleted) */
     void informAboutClearing(bool& cleared);
 
-signals:
+Q_SIGNALS:
     /*! Emitted when the value of the property is changed.*/
     void propertyChanged(KoProperty::Set& set, KoProperty::Property& property);
 
@@ -246,7 +246,7 @@
     /*! Intersects with other Set.*/
     virtual void intersect(const Set *set);
 
-protected slots:
+protected Q_SLOTS:
     void intersectedChanged(KoProperty::Set& set, KoProperty::Property& prop);
     void intersectedReset(KoProperty::Set& set, KoProperty::Property& prop);
 
Index: libs/koproperty2/editors/booledit.h
===================================================================
--- libs/koproperty2/editors/booledit.h	(Revision 859557)
+++ libs/koproperty2/editors/booledit.h	(Arbeitskopie)
@@ -46,7 +46,7 @@
 
     virtual void drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r, const QVariant &value);
 
-protected slots:
+protected Q_SLOTS:
     void  slotValueChanged(bool state);
 
 protected:
Index: libs/koproperty2/editors/timeedit.h
===================================================================
--- libs/koproperty2/editors/timeedit.h	(Revision 859557)
+++ libs/koproperty2/editors/timeedit.h	(Arbeitskopie)
@@ -44,7 +44,7 @@
 protected:
     virtual void setReadOnlyInternal(bool readOnly);
 
-protected slots:
+protected Q_SLOTS:
     void slotValueChanged(const QTime &time);
 
 private:
Index: libs/koproperty2/editors/stringlistedit.h
===================================================================
--- libs/koproperty2/editors/stringlistedit.h	(Revision 859557)
+++ libs/koproperty2/editors/stringlistedit.h	(Arbeitskopie)
@@ -47,7 +47,7 @@
 protected:
     virtual void setReadOnlyInternal(bool readOnly);
 
-protected slots:
+protected Q_SLOTS:
     void  showEditor();
 
 private:
Index: libs/koproperty2/editors/urledit.h
===================================================================
--- libs/koproperty2/editors/urledit.h	(Revision 859557)
+++ libs/koproperty2/editors/urledit.h	(Arbeitskopie)
@@ -44,7 +44,7 @@
 protected:
     virtual void setReadOnlyInternal(bool readOnly);
 
-protected slots:
+protected Q_SLOTS:
     void slotValueChanged(const QString &url);
 
 private:
Index: libs/koproperty2/editors/linestyleedit.h
===================================================================
--- libs/koproperty2/editors/linestyleedit.h	(Revision 859557)
+++ libs/koproperty2/editors/linestyleedit.h	(Arbeitskopie)
@@ -45,7 +45,7 @@
 protected:
     virtual void setReadOnlyInternal(bool readOnly);
 
-protected slots:
+protected Q_SLOTS:
     void slotValueChanged(int value);
 
 private:
Index: libs/koproperty2/editors/dateedit.h
===================================================================
--- libs/koproperty2/editors/dateedit.h	(Revision 859557)
+++ libs/koproperty2/editors/dateedit.h	(Arbeitskopie)
@@ -45,7 +45,7 @@
 protected:
     virtual void setReadOnlyInternal(bool readOnly);
 
-protected slots:
+protected Q_SLOTS:
     void  slotValueChanged(const QDate &date);
 
 private:
Index: libs/koproperty2/editors/datetimeedit.h
===================================================================
--- libs/koproperty2/editors/datetimeedit.h	(Revision 859557)
+++ libs/koproperty2/editors/datetimeedit.h	(Arbeitskopie)
@@ -45,7 +45,7 @@
 protected:
     virtual void setReadOnlyInternal(bool readOnly);
 
-protected slots:
+protected Q_SLOTS:
     void  slotValueChanged(const QDateTime &dateTime);
 
 private:
Index: libs/koproperty2/editors/pixmapedit.h
===================================================================
--- libs/koproperty2/editors/pixmapedit.h	(Revision 859557)
+++ libs/koproperty2/editors/pixmapedit.h	(Arbeitskopie)
@@ -54,7 +54,7 @@
 protected:
     virtual void setReadOnlyInternal(bool readOnly);
 
-protected slots:
+protected Q_SLOTS:
     /*! Helper used by selectPixmap(). Can be also used by subclassess.
      Selected path will be stored in "lastVisitedImagePath" config entry within "Recent Dirs"
      config group of application's settings. This entry can be later reused when file dialogs
Index: libs/koproperty2/editors/combobox.h
===================================================================
--- libs/koproperty2/editors/combobox.h	(Revision 859557)
+++ libs/koproperty2/editors/combobox.h	(Arbeitskopie)
@@ -42,7 +42,7 @@
     virtual void setProperty(Property *property);
     virtual void drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r, const QVariant &value);
 
-protected slots:
+protected Q_SLOTS:
     void slotValueChanged(int value);
 
 protected:
Index: libs/koproperty2/editors/stringedit.h
===================================================================
--- libs/koproperty2/editors/stringedit.h	(Revision 859557)
+++ libs/koproperty2/editors/stringedit.h	(Arbeitskopie)
@@ -42,7 +42,7 @@
 protected:
     virtual void setReadOnlyInternal(bool readOnly);
 
-protected slots:
+protected Q_SLOTS:
     void slotValueChanged(const QString&);
 
 protected:
Index: libs/koproperty2/editors/fontedit.h
===================================================================
--- libs/koproperty2/editors/fontedit.h	(Revision 859557)
+++ libs/koproperty2/editors/fontedit.h	(Arbeitskopie)
@@ -48,7 +48,7 @@
     virtual void setReadOnlyInternal(bool readOnly);
     virtual bool eventFilter(QObject* watched, QEvent* e);
 
-protected slots:
+protected Q_SLOTS:
     void  slotValueChanged(const QFont &font);
 
 private:
Index: libs/koproperty2/editors/spinbox.h
===================================================================
--- libs/koproperty2/editors/spinbox.h	(Revision 859557)
+++ libs/koproperty2/editors/spinbox.h	(Arbeitskopie)
@@ -70,7 +70,7 @@
     virtual void setReadOnlyInternal(bool readOnly);
     void updateSpinWidgets();
 
-protected slots:
+protected Q_SLOTS:
     void slotValueChanged(int value);
 
 private:
@@ -96,7 +96,7 @@
         return QDoubleSpinBox::lineEdit();
     }
 
-public slots:
+public Q_SLOTS:
     virtual void setValue(const QVariant& value);
 };
 
@@ -116,7 +116,7 @@
     virtual void setReadOnlyInternal(bool readOnly);
     void updateSpinWidgets();
 
-protected slots:
+protected Q_SLOTS:
     void slotValueChanged(double value);
 
 private:
Index: libs/koproperty2/editors/symbolcombo.h
===================================================================
--- libs/koproperty2/editors/symbolcombo.h	(Revision 859557)
+++ libs/koproperty2/editors/symbolcombo.h	(Arbeitskopie)
@@ -45,7 +45,7 @@
 protected:
     virtual void setReadOnlyInternal(bool readOnly);
 
-protected slots:
+protected Q_SLOTS:
     void  selectChar();
     void  slotValueChanged(const QString &text);
 
Index: libs/koproperty2/widget.h
===================================================================
--- libs/koproperty2/widget.h	(Revision 859557)
+++ libs/koproperty2/widget.h	(Arbeitskopie)
@@ -90,7 +90,7 @@
      This flag is checked by Editor when the widget is about to show. */
     bool visibleFlag() const;
 
-signals:
+Q_SIGNALS:
     void valueChanged(Widget *widget);
     void acceptInput(Widget *widget);
     void rejectInput(Widget *widget);
Index: libs/koproperty2/editor.h
===================================================================
--- libs/koproperty2/editor.h	(Revision 859557)
+++ libs/koproperty2/editor.h	(Arbeitskopie)
@@ -90,7 +90,7 @@
     virtual void setFocus();
     virtual void setSorting(int column, bool ascending = true);
 
-public slots:
+public Q_SLOTS:
     /*! Populates the editor with an item for each property in the List.
       Also creates child items for composed properties.
      If \a preservePrevSelection is true, previously selected editor
@@ -112,11 +112,11 @@
     /*! Accept the changes mae to the current editor (as if the user had pressed Enter key) */
     void acceptInput();
 
-signals:
+Q_SIGNALS:
     /*! Emitted when current property set has been changed. May be 0. */
     void propertySetChanged(KoProperty::Set *set);
 
-protected slots:
+protected Q_SLOTS:
     /*! Updates property widget in the editor.*/
     void slotPropertyChanged(KoProperty::Set& set, KoProperty::Property& property);
 
Index: libs/resources/KoResourceServerProvider.h
===================================================================
--- libs/resources/KoResourceServerProvider.h	(Revision 859557)
+++ libs/resources/KoResourceServerProvider.h	(Arbeitskopie)
@@ -69,7 +69,7 @@
     KoResourceServer<KoAbstractGradient>* m_gradientServer;
     KoResourceServer<KoColorSet>* m_paletteServer;
     
-private slots:
+private Q_SLOTS:
 
     void paletteThreadDone();
     void patternThreadDone();

["qstring-clear.patch" (text/x-patch)]

Index: libs/main/KoDocumentChild.cpp
===================================================================
--- libs/main/KoDocumentChild.cpp	(Revision 859557)
+++ libs/main/KoDocumentChild.cpp	(Arbeitskopie)
@@ -321,7 +321,7 @@
         QApplication::setOverrideCursor(Qt::WaitCursor);
     }
 
-    m_tmpURL = QString();
+    m_tmpURL.clear();
 
     // see KoDocument::insertChild for an explanation what's going on
     // now :-)
Index: libs/main/KoFilterChain.cpp
===================================================================
--- libs/main/KoFilterChain.cpp	(Revision 859557)
+++ libs/main/KoFilterChain.cpp	(Arbeitskopie)
@@ -402,11 +402,11 @@
         delete m_inputTempFile;  // autodelete
         m_inputTempFile = 0;
     }
-    m_inputFile = QString();
+    m_inputFile.clear();
 
     if (!m_outputFile.isEmpty()) {
         m_inputFile = m_outputFile;
-        m_outputFile = QString();
+        m_outputFile.clear();
         m_inputTempFile = m_outputTempFile;
         m_outputTempFile = 0;
 
@@ -459,13 +459,13 @@
         if (!createTempFile(&m_inputTempFile)) {
             delete m_inputTempFile;
             m_inputTempFile = 0;
-            m_inputFile = QString();
+            m_inputFile.clear();
             return;
         }
         if (!document->saveNativeFormat(m_inputTempFile->fileName())) {
             delete m_inputTempFile;
             m_inputTempFile = 0;
-            m_inputFile = QString();
+            m_inputFile.clear();
             return;
         }
         m_inputFile = m_inputTempFile->fileName();
@@ -478,7 +478,7 @@
     if (!createTempFile(&m_outputTempFile, autoDelete)) {
         delete m_outputTempFile;
         m_outputTempFile = 0;
-        m_outputFile = QString();
+        m_outputFile.clear();
     } else
         m_outputFile = m_outputTempFile->fileName();
 }
Index: libs/main/KoTemplatesPane.cpp
===================================================================
--- libs/main/KoTemplatesPane.cpp	(Revision 859557)
+++ libs/main/KoTemplatesPane.cpp	(Arbeitskopie)
@@ -141,7 +141,7 @@
     QStandardItem* item = \
model()->itemFromIndex(m_documentList->selectionModel()->currentIndex());  
     if (!m_alwaysUseCheckBox->isChecked()) {
-        d->m_alwaysUseTemplate = QString();
+        d->m_alwaysUseTemplate.clear();
     } else {
         d->m_alwaysUseTemplate = item->data(Qt::UserRole + 1).toString();
     }
Index: libs/main/KoFilterManager.cpp
===================================================================
--- libs/main/KoFilterManager.cpp	(Revision 859557)
+++ libs/main/KoFilterManager.cpp	(Arbeitskopie)
@@ -230,7 +230,7 @@
     // Okay, let's invoke the filters one after the other
     m_direction = Import; // vital information!
     m_importUrl = url;  // We want to load that file
-    m_exportUrl = QString();  // This is null for sure, as embedded stuff isn't
+    m_exportUrl.clear();  // This is null for sure, as embedded stuff isn't
     // allowed to use that method
     status = chain->invokeChain();
 
Index: libs/store/KoXmlReader.cpp
===================================================================
--- libs/store/KoXmlReader.cpp	(Revision 859557)
+++ libs/store/KoXmlReader.cpp	(Arbeitskopie)
@@ -762,7 +762,7 @@
         valueHash.clear();
         valueList.clear();
         groups.clear();
-        docType = QString();
+        docType.clear();
 
         // reserve index #0
         cacheString(QString());
@@ -1024,9 +1024,9 @@
 {
     // just for sanity
     cdata = false;
-    entityName = QString();
+    entityName.clear();
 
-    errorMsg = QString();
+    errorMsg.clear();
     errorLine = 0;
     errorColumn = 0;
 
Index: libs/koproperty2/set.h
===================================================================
--- libs/koproperty2/set.h	(Revision 859557)
+++ libs/koproperty2/set.h	(Arbeitskopie)
@@ -69,7 +69,7 @@
         friend class Set;
     };
 
-    explicit Set(QObject *parent = 0, const QString &typeName = QString::null);
+    explicit Set(QObject *parent = 0, const QString &typeName = QString());
 
     /*! Constructs a deep copy of \a set.
      The new object will not have a QObject parent even if \a set has such parent. \
                */
Index: libs/koproperty2/editors/combobox.cpp
===================================================================
--- libs/koproperty2/editors/combobox.cpp	(Revision 859557)
+++ libs/koproperty2/editors/combobox.cpp	(Arbeitskopie)
@@ -125,7 +125,7 @@
             << "' (property '" << property()->name() << "')\nActual combobox \
contents: "  << list << endl;
         }
-        m_edit->setItemText(m_edit->currentIndex(), QString::null);
+        m_edit->setItemText(m_edit->currentIndex(), QString());
     }
 
     if (value.isNull())
Index: libs/koproperty2/editors/fontedit.cpp
===================================================================
--- libs/koproperty2/editors/fontedit.cpp	(Revision 859557)
+++ libs/koproperty2/editors/fontedit.cpp	(Arbeitskopie)
@@ -99,7 +99,7 @@
 {
     QFontInfo fi(value.value<QFont>());
     return fi.family() + (fi.bold() ? ' ' + i18n("Bold") : QString()) +
-           (fi.italic() ? ' ' + i18n("Italic") : QString::null) +
+           (fi.italic() ? ' ' + i18n("Italic") : QString()) +
            ' ' + QString::number(fi.pointSize());
 }
 
Index: libs/koproperty2/property.h
===================================================================
--- libs/koproperty2/property.h	(Revision 859557)
+++ libs/koproperty2/property.h	(Arbeitskopie)
@@ -220,20 +220,20 @@
      these with spaces. captionForDisplaying() is used to get original caption text \
usable  (with newline, if any) for displaying within a property editor. */
     Property(const QByteArray &name, const QVariant &value = QVariant(),
-             const QString &caption = QString::null, const QString &description = \
QString::null, +             const QString &caption = QString(), const QString \
&description = QString(),  int type = Auto, Property* parent = 0);
 
     /*! Constructs property of \ref ValueFromList type. */
     Property(const QByteArray &name, const QStringList &keys, const QStringList \
&strings,  const QVariant &value = QVariant(),
-             const QString &caption = QString::null, const QString &description = \
QString::null, +             const QString &caption = QString(), const QString \
&description = QString(),  int type = ValueFromList, Property* parent = 0);
 
     /*! Constructs property of \ref ValueFromList type.
      This is overload of the above ctor added for convenience. */
     Property(const QByteArray &name, ListData* listData,
              const QVariant &value = QVariant(),
-             const QString &caption = QString::null, const QString &description = \
QString::null, +             const QString &caption = QString(), const QString \
&description = QString(),  int type = ValueFromList, Property* parent = 0);
 
     /*! Constructs a deep copy of \a prop property. */
Index: libs/kotext/styles/KoListLevelProperties.cpp
===================================================================
--- libs/kotext/styles/KoListLevelProperties.cpp	(Revision 859557)
+++ libs/kotext/styles/KoListLevelProperties.cpp	(Arbeitskopie)
@@ -315,7 +315,7 @@
             default:
                 QChar customBulletChar = bulletChar[0];
                 kDebug(32500) << "Unhandled bullet code 0x" << \
                QString::number((uint)customBulletChar.unicode(), 16);
-                kDebug(32500) << "Should use the style =>" << \
style.attributeNS(KoXmlNS::text, "style-name", QString::null) << "<="; +              \
kDebug(32500) << "Should use the style =>" << style.attributeNS(KoXmlNS::text, \
"style-name", QString()) << "<=";  setStyle(KoListStyle::CustomCharItem);
                 /*
                 QString customBulletFont;



_______________________________________________
koffice-devel mailing list
koffice-devel@kde.org
https://mail.kde.org/mailman/listinfo/koffice-devel


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