remove redundant qt_defaultDpiX(), qt_defaultDpiY() and qt_defaultDpi() functions

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/declarative/qml/qdeclarativevaluetype.cpp b/src/declarative/qml/qdeclarativevaluetype.cpp
index cfb2b64..381b999 100644 (file)
--- a/src/declarative/qml/qdeclarativevaluetype.cpp
+++ b/src/declarative/qml/qdeclarativevaluetype.cpp
@@ -40,12 +40,10 @@
 ****************************************************************************/
 
 #include "qdeclarativevaluetype_p.h"
-
 #include "qdeclarativemetatype_p.h"
-#include "qfont_p.h"
-
-#include <QtGui/qapplication.h>
-#include <QtCore/qdebug.h>
+#include "qx11info_x11.h"
+#include "qapplication.h"
+#include "qdebug.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -932,7 +930,7 @@ qreal QDeclarativeFontValueType::pointSize() const
 {
     if (font.pointSizeF() == -1) {
         if (dpi.isNull)
-            dpi = qt_defaultDpi();
+            dpi = QX11Info::appDpiY();
         return font.pixelSize() * qreal(72.) / qreal(dpi);
     }
     return font.pointSizeF();
@@ -957,7 +955,7 @@ int QDeclarativeFontValueType::pixelSize() const
 {
     if (font.pixelSize() == -1) {
         if (dpi.isNull)
-            dpi = qt_defaultDpi();
+            dpi = QX11Info::appDpiY();
         return (font.pointSizeF() * dpi) / qreal(72.);
     }
     return font.pixelSize();

diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 7b88eda..4c2e004 100644 (file)
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -50,20 +50,18 @@
 #include "qstringlist.h"
 #include "qvariant.h"
 #include "qcolormap.h"
-#include <ctype.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <math.h>
 #include "qdrawhelper_p.h"
 #include "qmemrotate_p.h"
 #include "qpixmapdata_p.h"
-
 #include "qhash.h"
-
 #include "qpaintengine_raster_p.h"
-
 #include "qimage_p.h"
-#include "qfont_p.h"
+#include "qx11info_x11.h"
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <math.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -134,8 +132,8 @@ QImageData::QImageData()
       format(QImage::Format_ARGB32), bytes_per_line(0),
       ser_no(qimage_serial_number.fetchAndAddRelaxed(1)),
       detach_no(0),
-      dpmx(qt_defaultDpiX() * 100 / qreal(2.54)),
-      dpmy(qt_defaultDpiY() * 100 / qreal(2.54)),
+      dpmx(QX11Info::appDpiX() * 100 / qreal(2.54)),
+      dpmy(QX11Info::appDpiY() * 100 / qreal(2.54)),
       offset(0, 0), own_data(true), ro_data(false), has_alpha_clut(false),
       paintEngine(0)
 {

diff --git a/src/gui/image/qpixmap_raster.cpp b/src/gui/image/qpixmap_raster.cpp
index 138bfaf..168a10c 100644 (file)
--- a/src/gui/image/qpixmap_raster.cpp
+++ b/src/gui/image/qpixmap_raster.cpp
@@ -248,19 +248,19 @@ int QRasterPixmapData::metric(QPaintDevice::PaintDeviceMetric metric) const
     case QPaintDevice::PdmHeight:
         return h;
     case QPaintDevice::PdmWidthMM:
-        return qRound(d->width * 25.4 / qt_defaultDpiX());
+        return qRound(d->width * 25.4 / QX11Info::appDpiX());
     case QPaintDevice::PdmHeightMM:
-        return qRound(d->height * 25.4 / qt_defaultDpiY());
+        return qRound(d->height * 25.4 / QX11Info::appDpiY());
     case QPaintDevice::PdmNumColors:
         return d->colortable.size();
     case QPaintDevice::PdmDepth:
         return depth();
     case QPaintDevice::PdmDpiX: // fall-through
     case QPaintDevice::PdmPhysicalDpiX:
-        return qt_defaultDpiX();
+        return QX11Info::appDpiX();
     case QPaintDevice::PdmDpiY: // fall-through
     case QPaintDevice::PdmPhysicalDpiY:
-        return qt_defaultDpiY();
+        return QX11Info::appDpiY();
     default:
         qWarning("QRasterPixmapData::metric(): Unhandled metric type %d", metric);
         break;

diff --git a/src/gui/painting/qpaintengine_alpha.cpp b/src/gui/painting/qpaintengine_alpha.cpp
index 24a3aaf..53ac55a 100644 (file)
--- a/src/gui/painting/qpaintengine_alpha.cpp
+++ b/src/gui/painting/qpaintengine_alpha.cpp
@@ -44,7 +44,8 @@
 #ifndef QT_NO_PRINTER
 #include "qdebug.h"
 #include "qpaintengine_alpha_p.h"
-#include "qfont_p.h"
+#include "qfont.h"
+#include "qx11info_x11.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -322,8 +323,8 @@ void QAlphaPaintEngine::flushAndInit(bool init)
 
         // make sure the output from QImage is unscaled
         QTransform mtx;
-        mtx.scale(1.0f / (qreal(d->m_pdev->logicalDpiX()) / qreal(qt_defaultDpiX())),
-                  1.0f / (qreal(d->m_pdev->logicalDpiY()) / qreal(qt_defaultDpiY())));
+        mtx.scale(1.0f / (qreal(d->m_pdev->logicalDpiX()) / qreal(QX11Info::appDpiX())),
+                  1.0f / (qreal(d->m_pdev->logicalDpiY()) / qreal(QX11Info::appDpiY())));
         painter()->setTransform(mtx);
         painter()->drawImage(0, 0, *d->m_pic);
 

diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp
index b05cb1d..079b98a 100644 (file)
--- a/src/gui/painting/qpdf.cpp
+++ b/src/gui/painting/qpdf.cpp
@@ -47,7 +47,7 @@
 #include "qcups_p.h"
 #include "qprinterinfo.h"
 #include "qnumeric.h"
-#include "qfont_p.h"
+#include "qx11info_x11.h"
 
 #ifdef Q_OS_UNIX
 #include "qcore_unix_p.h" // overrides QT_OPEN
@@ -1606,7 +1606,7 @@ QPdfBaseEnginePrivate::QPdfBaseEnginePrivate(QPrinter::PrinterMode m)
     if (m == QPrinter::HighResolution)
         resolution = 1200;
     else if (m == QPrinter::ScreenResolution)
-        resolution = qt_defaultDpi();
+        resolution = QX11Info::appDpiY();
 
     postscript = false;
     currentObject = 1;

diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index 7a6fbee..7a2ec3b 100644 (file)
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -134,35 +134,8 @@ bool QFontDef::exactMatch(const QFontDef &other) const
        );
 }
 
-extern bool qt_is_gui_used;
-
-Q_GUI_EXPORT int qt_defaultDpiX()
-{
-    if (!qt_is_gui_used)
-        return 75;
-
-#ifdef Q_WS_X11
-    return QX11Info::appDpiX();
-#endif // Q_WS_X11
-}
-
-Q_GUI_EXPORT int qt_defaultDpiY()
-{
-    if (!qt_is_gui_used)
-        return 75;
-
-#ifdef Q_WS_X11
-    return QX11Info::appDpiY();
-#endif // Q_WS_X11
-}
-
-Q_GUI_EXPORT int qt_defaultDpi()
-{
-    return qt_defaultDpiY();
-}
-
 QFontPrivate::QFontPrivate()
-    : engineData(0), dpi(qt_defaultDpi()), screen(0),
+    : engineData(0), dpi(QX11Info::appDpiY()), screen(0),
       underline(false), overline(false), strikeOut(false), kerning(true),
       capital(QFont::MixedCase), letterSpacingIsAbsolute(false), scFont(0)
 {

diff --git a/src/gui/text/qfont_p.h b/src/gui/text/qfont_p.h
index b861418..7bfe4f0 100644 (file)
--- a/src/gui/text/qfont_p.h
+++ b/src/gui/text/qfont_p.h
@@ -243,10 +243,6 @@ public:
     int timer_id;
 };
 
-Q_GUI_EXPORT int qt_defaultDpiX();
-Q_GUI_EXPORT int qt_defaultDpiY();
-Q_GUI_EXPORT int qt_defaultDpi();
-
 QT_END_NAMESPACE
 
 #endif // QFONT_P_H

diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index 55b09e0..b9b6275 100644 (file)
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -1246,7 +1246,7 @@ QList<int> QFontDatabase::pointSizes(const QString &family,
 #ifdef Q_WS_X11
     int dpi = QX11Info::appDpiY();
 #else
-    const int dpi = qt_defaultDpiY(); // embedded
+    const int dpi = QX11Info::appDpiY(); // embedded
 #endif
 
     for (int j = 0; j < fam->count; j++) {
@@ -1346,7 +1346,7 @@ QList<int> QFontDatabase::smoothSizes(const QString &family,
 #ifdef Q_WS_X11
     const int dpi = QX11Info::appDpiY();
 #else
-    const int dpi = qt_defaultDpiY(); // embedded
+    const int dpi = QX11Info::appDpiY(); // embedded
 #endif
 
     for (int j = 0; j < fam->count; j++) {

diff --git a/src/gui/text/qfontdatabase_x11_p.h b/src/gui/text/qfontdatabase_x11_p.h
index ac63910..9a09d6c 100644 (file)
--- a/src/gui/text/qfontdatabase_x11_p.h
+++ b/src/gui/text/qfontdatabase_x11_p.h
@@ -176,7 +176,7 @@ QFontDef qt_FcPatternToQFontDef(FcPattern *pattern, const QFontDef &request)
         if (qt_x11Data->display)
             dpi = QX11Info::appDpiY();
         else
-            dpi = qt_defaultDpiY();
+            dpi = QX11Info::appDpiY();
     }
 
     double size;

diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp
index 92bafb8..528415e 100644 (file)
--- a/src/gui/text/qfontmetrics.cpp
+++ b/src/gui/text/qfontmetrics.cpp
@@ -181,7 +181,7 @@ QFontMetrics::QFontMetrics(const QFont &font)
 */
 QFontMetrics::QFontMetrics(const QFont &font, QPaintDevice *paintdevice)
 {
-    int dpi = paintdevice ? paintdevice->logicalDpiY() : qt_defaultDpi();
+    int dpi = paintdevice ? paintdevice->logicalDpiY() : QX11Info::appDpiY();
 #ifdef Q_WS_X11
     const QX11Info *info = qt_x11Info(paintdevice);
     int screen = info ? info->screen() : 0;
@@ -1050,7 +1050,7 @@ QFontMetricsF::QFontMetricsF(const QFont &font)
 */
 QFontMetricsF::QFontMetricsF(const QFont &font, QPaintDevice *paintdevice)
 {
-    int dpi = paintdevice ? paintdevice->logicalDpiY() : qt_defaultDpi();
+    int dpi = paintdevice ? paintdevice->logicalDpiY() : QX11Info::appDpiY();
 #ifdef Q_WS_X11
     const QX11Info *info = qt_x11Info(paintdevice);
     int screen = info ? info->screen() : 0;

diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp
index c5c1365..0b13ba8 100644 (file)
--- a/src/gui/text/qstatictext.cpp
+++ b/src/gui/text/qstatictext.cpp
@@ -46,6 +46,7 @@
 #include "qfontmetrics.h"
 #include "qabstracttextdocumentlayout.h"
 #include "qapplication.h"
+#include "qx11info_x11.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -503,11 +504,11 @@ namespace {
                 break;
             case PdmDpiX:
             case PdmPhysicalDpiX:
-                val = qt_defaultDpiX();
+                val = QX11Info::appDpiX();
                 break;
             case PdmDpiY:
             case PdmPhysicalDpiY:
-                val = qt_defaultDpiY();
+                val = QX11Info::appDpiY();
                 break;
             case PdmNumColors:
                 val = 16777216;

diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index 28faa88..bf6f9b9 100644 (file)
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -1736,7 +1736,7 @@ void QTextDocument::print(QPrinter *printer) const
     QPointF pageNumberPos;
 
     if (documentPaginated) {
-        qreal sourceDpiX = qt_defaultDpi();
+        qreal sourceDpiX = QX11Info::appDpiY();
         qreal sourceDpiY = sourceDpiX;
 
         QPaintDevice *dev = doc->documentLayout()->paintDevice();

diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp
index 0e31b2d..b2c4e14 100644 (file)
--- a/src/gui/text/qtextdocumentlayout.cpp
+++ b/src/gui/text/qtextdocumentlayout.cpp
@@ -57,6 +57,7 @@
 #include "qstyle.h"
 #include "qbasictimer.h"
 #include "qfontmetrics.h"
+#include "qx11info_x11.h"
 
 #include <limits.h>
 
@@ -800,7 +801,7 @@ QFixed QTextDocumentLayoutPrivate::blockIndent(const QTextBlockFormat &blockForm
 
     qreal scale = 1;
     if (paintDevice) {
-        scale = qreal(paintDevice->logicalDpiY()) / qreal(qt_defaultDpi());
+        scale = qreal(paintDevice->logicalDpiY()) / qreal(QX11Info::appDpiY());
     }
 
     return QFixed::fromReal(indent * scale * document->indentWidth());
@@ -2542,7 +2543,7 @@ void QTextDocumentLayoutPrivate::layoutBlock(const QTextBlock &bl, int blockPosi
     if (previousBlockFormat) {
         qreal margin = qMax(blockFormat.topMargin(), previousBlockFormat->bottomMargin());
         if (margin > 0 && q->paintDevice()) {
-            margin *= qreal(q->paintDevice()->logicalDpiY()) / qreal(qt_defaultDpi());
+            margin *= qreal(q->paintDevice()->logicalDpiY()) / qreal(QX11Info::appDpiY());
         }
         layoutStruct->y += QFixed::fromReal(margin);
     }
@@ -2661,8 +2662,8 @@ void QTextDocumentLayoutPrivate::layoutBlock(const QTextBlock &bl, int blockPosi
             }
 
             QFixed lineBreakHeight, lineHeight, lineAdjustment;
-            qreal scaling = (q->paintDevice() && q->paintDevice()->logicalDpiY() != qt_defaultDpi()) ?
-                            qreal(q->paintDevice()->logicalDpiY()) / qreal(qt_defaultDpi()) : 1;
+            qreal scaling = (q->paintDevice() && q->paintDevice()->logicalDpiY() != QX11Info::appDpiY()) ?
+                            qreal(q->paintDevice()->logicalDpiY()) / qreal(QX11Info::appDpiY()) : 1;
             getLineHeightParams(blockFormat, line, scaling, &lineAdjustment, &lineBreakHeight, &lineHeight);
 
             if (layoutStruct->pageHeight > 0 && layoutStruct->absoluteY() + lineBreakHeight > layoutStruct->pageBottom) {
@@ -2699,8 +2700,8 @@ void QTextDocumentLayoutPrivate::layoutBlock(const QTextBlock &bl, int blockPosi
                 = qMax(layoutStruct->contentsWidth, QFixed::fromReal(line.x() + tl->lineAt(i).naturalTextWidth()) + totalRightMargin);
 
             QFixed lineBreakHeight, lineHeight, lineAdjustment;
-            qreal scaling = (q->paintDevice() && q->paintDevice()->logicalDpiY() != qt_defaultDpi()) ?
-                            qreal(q->paintDevice()->logicalDpiY()) / qreal(qt_defaultDpi()) : 1;
+            qreal scaling = (q->paintDevice() && q->paintDevice()->logicalDpiY() != QX11Info::appDpiY()) ?
+                            qreal(q->paintDevice()->logicalDpiY()) / qreal(QX11Info::appDpiY()) : 1;
             getLineHeightParams(blockFormat, line, scaling, &lineAdjustment, &lineBreakHeight, &lineHeight);
 
             if (layoutStruct->pageHeight != QFIXED_MAX) {
@@ -3263,14 +3264,14 @@ qreal QTextDocumentLayoutPrivate::scaleToDevice(qreal value) const
 {
     if (!paintDevice)
         return value;
-    return value * paintDevice->logicalDpiY() / qreal(qt_defaultDpi());
+    return value * paintDevice->logicalDpiY() / qreal(QX11Info::appDpiY());
 }
 
 QFixed QTextDocumentLayoutPrivate::scaleToDevice(QFixed value) const
 {
     if (!paintDevice)
         return value;
-    return value * QFixed(paintDevice->logicalDpiY()) / QFixed(qt_defaultDpi());
+    return value * QFixed(paintDevice->logicalDpiY()) / QFixed(QX11Info::appDpiY());
 }
 
 QT_END_NAMESPACE

diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index b2cc6af..94fdc2b 100644 (file)
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -48,11 +48,11 @@
 #include "qtextboundaryfinder.h"
 #include "qvarlengtharray.h"
 #include "qfont.h"
-#include "qfont_p.h"
 #include "qfontengine_p.h"
 #include "qunicodetables_p.h"
 #include "qtextdocument_p.h"
 #include "qapplication.h"
+#include "qx11info_x11.h"
 
 #if defined(Q_WS_X11)
 #   include "qfontengine_ft_p.h"
@@ -897,7 +897,7 @@ void QTextEngine::shapeText(int item) const
     QFixed wordSpacing = font.d->wordSpacing;
 
     if (letterSpacingIsAbsolute && letterSpacing.value())
-        letterSpacing *= font.d->dpi / qt_defaultDpiY();
+        letterSpacing *= font.d->dpi / QX11Info::appDpiY();
 
     if (letterSpacing != 0) {
         for (int i = 1; i < si.num_glyphs; ++i) {
@@ -2427,9 +2427,9 @@ QFixed QTextEngine::calculateTabWidth(int item, QFixed x) const
     if (block.docHandle() && block.docHandle()->layout()) {
         QPaintDevice *pdev = block.docHandle()->layout()->paintDevice();
         if (pdev)
-            dpiScale = QFixed::fromReal(pdev->logicalDpiY() / qreal(qt_defaultDpiY()));
+            dpiScale = QFixed::fromReal(pdev->logicalDpiY() / qreal(QX11Info::appDpiY()));
     } else {
-        dpiScale = QFixed::fromReal(fnt.d->dpi / qreal(qt_defaultDpiY()));
+        dpiScale = QFixed::fromReal(fnt.d->dpi / qreal(QX11Info::appDpiY()));
     }
 
     QList<QTextOption::Tab> tabArray = option.tabs();

diff --git a/src/gui/text/qtextimagehandler.cpp b/src/gui/text/qtextimagehandler.cpp
index 2da1733..7e80fbc 100644 (file)
--- a/src/gui/text/qtextimagehandler.cpp
+++ b/src/gui/text/qtextimagehandler.cpp
@@ -50,6 +50,7 @@
 #include "qpalette.h"
 #include "qtextbrowser.h"
 #include "qthread.h"
+#include "qx11info_x11.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -120,7 +121,7 @@ static QSize getPixmapSize(QTextDocument *doc, const QTextImageFormat &format)
         if (pm.isNull())
             pm = getPixmap(doc, format);
         if (!pm.isNull())
-            scale = qreal(pdev->logicalDpiY()) / qreal(qt_defaultDpi());
+            scale = qreal(pdev->logicalDpiY()) / qreal(QX11Info::appDpiY());
     }
     size *= scale;
 
@@ -185,7 +186,7 @@ static QSize getImageSize(QTextDocument *doc, const QTextImageFormat &format)
         if (image.isNull())
             image = getImage(doc, format);
         if (!image.isNull())
-            scale = qreal(pdev->logicalDpiY()) / qreal(qt_defaultDpi());
+            scale = qreal(pdev->logicalDpiY()) / qreal(QX11Info::appDpiY());
     }
     size *= scale;