[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase
From: Stephan Kulow <coolo () kde ! org>
Date: 2006-05-01 17:32:19
Message-ID: 1146504739.256657.16428.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 536247 by coolo:
removed deprecated functions
M +1 -1 kioslave/smb/kio_smb_auth.cpp
M +4 -4 kioslave/smb/kio_smb_browse.cpp
M +3 -3 workspace/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
M +11 -10 workspace/kcontrol/kfontinst/lib/FcEngine.cpp
--- trunk/KDE/kdebase/kioslave/smb/kio_smb_auth.cpp #536246:536247
@@ -118,7 +118,7 @@
info.url.setHost(url.host());
QString share = url.path();
- int index = share.find('/', 1);
+ int index = share.indexOf('/', 1);
if (index > 1)
share = share.left(index);
if (share.at(0) == '/')
--- trunk/KDE/kdebase/kioslave/smb/kio_smb_browse.cpp #536246:536247
@@ -185,11 +185,11 @@
// we must redirect ourself to remove the username and password
if (surl.contains('@') && !surl.contains("smb://")) {
KUrl url(kurl);
- url.setPath("/"+kurl.url().right( kurl.url().length()-kurl.url().find('@') \
-1));
- QString userinfo = kurl.url().mid(5, kurl.url().find('@')-5);
+ url.setPath("/"+kurl.url().right( \
kurl.url().length()-kurl.url().indexOf('@') -1)); + QString userinfo = \
kurl.url().mid(5, kurl.url().indexOf('@')-5); if(userinfo.contains(':')) {
- url.setUser(userinfo.left(userinfo.find(':')));
- url.setPass(userinfo.right(userinfo.length()-userinfo.find(':')-1));
+ url.setUser(userinfo.left(userinfo.indexOf(':')));
+ url.setPass(userinfo.right(userinfo.length()-userinfo.indexOf(':')-1));
} else {
url.setUser(userinfo);
}
--- trunk/KDE/kdebase/workspace/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp \
#536246:536247 @@ -61,8 +61,8 @@
return FC_WEIGHT_ULTRALIGHT;
else if(str.contains("Light", Qt::CaseInsensitive))
return FC_WEIGHT_LIGHT;
- else if(str.contains("Medium", Qt::CaseInsensitive) ||
- str.contains("Normal", Qt::CaseInsensitive) ||
+ else if(str.contains("Medium", Qt::CaseInsensitive) ||
+ str.contains("Normal", Qt::CaseInsensitive) ||
str.contains("Roman", Qt::CaseInsensitive))
return FC_WEIGHT_MEDIUM;
else if(str.contains("Regular", Qt::CaseInsensitive))
@@ -221,7 +221,7 @@
else if(0==line.indexOf("ItalicAngle "))
intSlant=0.0f==line.mid(12).toFloat() ? FC_SLANT_ROMAN : \
FC_SLANT_ITALIC; else if(0==line.indexOf("IsFixedPitch "))
- intSpacing=0==line.mid(13).find("false", 0, false) ? \
FC_PROPORTIONAL : FC_MONO; + intSpacing= ( \
line.mid(13).contains("false", Qt::CaseInsensitive) ? FC_PROPORTIONAL : FC_MONO ); \
else if(0==line.indexOf("Notice ")) foundry=getFoundry(line.mid(7).toLatin1());
else if(0==line.indexOf("StartCharMetrics"))
--- trunk/KDE/kdebase/workspace/kcontrol/kfontinst/lib/FcEngine.cpp #536246:536247
@@ -2,6 +2,7 @@
#include <qpixmap.h>
#include <qfontmetrics.h>
#include <qfile.h>
+#include <QX11Info>
#include <qtextstream.h>
#include <kurl.h>
#include <kconfig.h>
@@ -21,7 +22,7 @@
#define KFI_PREVIEW_STRING_KEY "String"
#ifdef HAVE_XFT
-#define KFI_DISPLAY(pix) (pix ? pix->x11Display() : QPaintDevice::x11AppDisplay())
+#define KFI_DISPLAY(pix) (pix ? pix->x11Display() : QX11Info::display())
#endif
// CPD: TODO: should I use latin1, toLocal8Bit, or toUtf8?
@@ -372,7 +373,7 @@
XGlyphInfo extents;
const FcChar16 *str=(FcChar16 *)(&(text.utf16()[pos]));
- XftTextExtents16(pix.x11Display(), xftFont, str, 1, &extents);
+ XftTextExtents16( QX11Info::display(), xftFont, str, 1, &extents);
if(x+extents.width+2>w)
{
@@ -395,7 +396,7 @@
XGlyphInfo extents;
const FcChar16 *str=(FcChar16 *)(text.utf16());
- XftTextExtents16(pix.x11Display(), xftFont, str, text.length(), &extents);
+ XftTextExtents16(QX11Info::display(), xftFont, str, text.length(), &extents);
if(y+extents.height<h)
XftDrawString16(xftDraw, xftCol, xftFont, x, y+extents.y, str, \
text.length()); if(extents.height>0)
@@ -411,7 +412,7 @@
{
XGlyphInfo extents;
- XftGlyphExtents(pix.x11Display(), xftFont, &i, 1, &extents);
+ XftGlyphExtents(QX11Info::display(), xftFont, &i, 1, &extents);
if(x+extents.width+2>w)
{
@@ -504,12 +505,12 @@
xrenderCol.red=xrenderCol.green=xrenderCol.blue=0;
xrenderCol.alpha=0xffff;
- XftColorAllocValue(pix.x11Display(), DefaultVisual(pix.x11Display(),
+ XftColorAllocValue(QX11Info::display(), DefaultVisual(pix.x11Display(),
pix.x11Screen()),
- DefaultColormap(pix.x11Display(), pix.x11Screen()),
+ DefaultColormap(QX11Info::display(), \
pix.x11Screen()), &xrenderCol, &xftCol);
- XftDraw *xftDraw=XftDrawCreate(pix.x11Display(), (Pixmap)(pix.handle()),
+ XftDraw *xftDraw=XftDrawCreate(QX11Info::display(), \
(Pixmap)(pix.handle()),
(Visual*)(pix.x11Visual()), \
pix.x11Colormap());
if(xftDraw)
@@ -645,7 +646,7 @@
for(int i=1; i<face->num_glyphs && y<w && \
!stop; ++i) {
- XftGlyphExtents(pix.x11Display(), \
xftFont, (const FT_UInt *)&i, 1, &extents); + \
XftGlyphExtents(QX11Info::display(), xftFont, (const FT_UInt *)&i, 1, &extents);
if(y+extents.height>h)
stop=true;
@@ -670,7 +671,7 @@
}
else
drawString(pix, xftDraw, xftFont, &xftCol, \
previewString, x, y, h, offset);
- XftFontClose(pix.x11Display(), xftFont);
+ XftFontClose(QX11Info::display(), xftFont);
}
}
}
@@ -993,7 +994,7 @@
itsDescriptiveName=name;
itsSpacing=FC_PROPORTIONAL;
- if(-1==(pos=name.find(", "))) // No style information...
+ if(-1==(pos=name.indexOf(", "))) // No style information...
{
itsWeight=FC_WEIGHT_NORMAL;
#ifndef KFI_FC_NO_WIDTHS
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic