[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/multimedia/kmplayer/src
From: Koos Vriezen <koos.vriezen () gmail ! com>
Date: 2008-01-31 22:14:55
Message-ID: 1201817695.281834.28405.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 769230 by vriezen:
Use QByteArray constData() where possible
M +3 -5 kmplayer_part.cpp
M +0 -1 kmplayer_part.h
M +2 -3 kmplayer_smil.cpp
M +0 -1 kmplayer_smil.h
M +13 -12 kmplayerprocess.cpp
M +2 -2 mediaobject.cpp
M +2 -2 triestring.cpp
M +3 -3 viewarea.cpp
--- trunk/extragear/multimedia/kmplayer/src/kmplayer_part.cpp #769229:769230
@@ -341,9 +341,8 @@
}
// volume/clicktoplay/transparentatstart/animationatstart
// autorewind/displaysize/border
- if (name.startsWith (QString::fromLatin1 ("__khtml__")))
- name = name.mid (9);
- convertNode <KMPlayer::Element> (source->document ())->setAttribute \
(name, value); + if (!name.startsWith (QString::fromLatin1 ("__khtml__")))
+ convertNode <KMPlayer::Element> (source->document ())->setAttribute \
(name, value); }
}
if (turned_off_features) {
@@ -376,8 +375,7 @@
if (m_features & (Feat_Controls | Feat_VolumeSlider)) {
m_view->setControlPanelMode (m_features & Feat_Viewer ? \
KMPlayer::View::CP_Show : KMPlayer::View::CP_Only); m_expected_view_height -= \
m_view->controlPanel ()->height ();
- }
- else if (parent ())
+ } else if (parent ())
m_view->setControlPanelMode (KMPlayer::View::CP_Hide);
else
m_view->setControlPanelMode (KMPlayer::View::CP_AutoHide);
--- trunk/extragear/multimedia/kmplayer/src/kmplayer_part.h #769229:769230
@@ -161,7 +161,6 @@
QString m_file_name;
QString m_grab_file;
QString m_target;
- KMPlayer::AttributeListPtr m_doc_attributes;
int m_expected_view_width;
int m_expected_view_height;
int m_features;
--- trunk/extragear/multimedia/kmplayer/src/kmplayer_smil.cpp #769229:769230
@@ -1095,8 +1095,7 @@
rl->setAttribute(StringPool::attr_width, QString::number(w_root));
rl->setAttribute(StringPool::attr_height,QString::number(h_root));
insertBefore (sr, firstChild ());
- }
- else {
+ } else {
Smil *s = Smil::findSmilNode (this);
if (s) {
s->width = rl->getAttribute(StringPool::attr_width).toDouble ();
@@ -3035,7 +3034,7 @@
if (success)
AnimateGroup::begin ();
else
- runtime ()->propagateStop (true);
+ rt->propagateStop (true);
}
KDE_NO_EXPORT void SMIL::Animate::finish () {
--- trunk/extragear/multimedia/kmplayer/src/kmplayer_smil.h #769229:769230
@@ -703,7 +703,6 @@
TrieString changed_attribute;
QString change_to;
int modification_id;
-protected:
};
class KMPLAYER_NO_EXPORT Set : public AnimateGroup {
--- trunk/extragear/multimedia/kmplayer/src/kmplayerprocess.cpp #769229:769230
@@ -699,8 +699,8 @@
m_old_state = m_state = Buffering;
unlink (file.ascii ());
QByteArray ba = file.toLocal8Bit ();
- char *buf = new char[strlen (ba.data ()) + 7];
- strcpy (buf, ba.data ());
+ char *buf = new char[strlen (ba.constData ()) + 7];
+ strcpy (buf, ba.constData ());
strcat (buf, "XXXXXX");
if (mkdtemp (buf)) {
m_grab_dir = QString (buf);
@@ -905,8 +905,8 @@
if (!renamed) {
kDebug() << "rename " << dir.filePath (files[i]) << "->" << \
m_grab_file; renamed = true;
- ::rename (dir.filePath (files[i]).toLocal8Bit ().data (),
- m_grab_file.toLocal8Bit ().data ());
+ ::rename (dir.filePath (files[i]).toLocal8Bit().constData(),
+ m_grab_file.toLocal8Bit ().constData ());
} else {
kDebug() << "rm " << files[i];
dir.remove (files[i]);
@@ -1461,7 +1461,7 @@
cmd += QString (" -cb ");
cmd += m_service;
cmd += m_path;
- fprintf (stderr, "%s\n", cmd.local8Bit ().data ());
+ fprintf (stderr, "%s\n", cmd.local8Bit ().constData ());
*m_slave << cmd;
m_slave->start (K3Process::NotifyOnExit, K3Process::All);
return m_slave->isRunning ();
@@ -2308,13 +2308,13 @@
QString result = npp->evaluate (url.mid (11));
if (!result.isEmpty ()) {
QByteArray cr = result.toLocal8Bit ();
- int len = strlen (cr.data ());
+ int len = strlen (cr.constData ());
pending_buf.resize (len + 1);
- memcpy (pending_buf.data (), cr.data (), len);
+ memcpy (pending_buf.data (), cr.constData (), len);
pending_buf.data ()[len] = 0;
gettimeofday (&data_arrival, 0L);
}
- kDebug () << "result is " << pending_buf.data ();
+ kDebug () << "result is " << pending_buf.constData ();
finish_reason = BecauseDone;
emit stateChanged ();
} else {
@@ -2357,7 +2357,7 @@
int sz = pending_buf.size ();
if (sz) {
pending_buf.resize (sz + qb.size ());
- memcpy (pending_buf.data () + sz, qb.data (), qb.size ());
+ memcpy (pending_buf.data () + sz, qb.constData (), qb.size ());
} else {
pending_buf = qb;
}
@@ -2500,7 +2500,7 @@
cmd += path;
cmd += QString (" -wid ");
cmd += QString::number (media_object->viewer->windowHandle ());
- fprintf (stderr, "%s\n", cmd.local8Bit ().data ());
+ fprintf (stderr, "%s\n", cmd.local8Bit ().constData ());
*m_process << cmd;
m_process->start (K3Process::NotifyOnExit, K3Process::All);
return m_process->isRunning ();
@@ -2731,12 +2731,13 @@
send_buf.resize (chunk + header_len);
memcpy (send_buf.data (), &stream_id, sizeof (Q_UINT32));
memcpy (send_buf.data() + sizeof (Q_UINT32), &chunk, sizeof (Q_UINT32));
- memcpy (send_buf.data()+header_len, stream->pending_buf.data (), chunk);
+ memcpy (send_buf.data ()+header_len,
+ stream->pending_buf.constData (), chunk);
stream->pending_buf = QByteArray ();
/*fprintf (stderr, " => %d %d\n", (long)stream_id, chunk);*/
stream->bytes += chunk;
write_in_progress = true;
- m_process->writeStdin (send_buf.data (), send_buf.size ());
+ m_process->writeStdin (send_buf.constData (), send_buf.size ());
if (stream->finish_reason == NpStream::NoReason)
stream->job->resume ();
}
--- trunk/extragear/multimedia/kmplayer/src/mediaobject.cpp #769229:769230
@@ -305,7 +305,7 @@
bool DataCache::get (const QString & url, QByteArray & data) {
DataMap::const_iterator it = cache_map.find (url);
if (it != cache_map.end ()) {
- data.duplicate (it.data ());
+ data = it.data ();
return true;
}
return false;
@@ -450,7 +450,7 @@
if (qb.size ()) {
int old_size = data.size ();
data.resize (old_size + qb.size ());
- memcpy (data.data () + old_size, qb.data (), qb.size ());
+ memcpy (data.data () + old_size, qb.constData (), qb.size ());
}
}
--- trunk/extragear/multimedia/kmplayer/src/triestring.cpp #769229:769230
@@ -41,7 +41,7 @@
void removeChild (TrieNode *);
void dump (int lvl) {
QString indent (QString ().fill (QChar ('.'), lvl));
- printf("%s%s len:%4d rc:%4d\n", indent.toAscii().data(), str, length, \
ref_count); + printf("%s%s len:%4d rc:%4d\n", indent.toAscii().constData(), \
str, length, ref_count); }
char * str;
unsigned short length;
@@ -270,7 +270,7 @@
}
TrieString::TrieString (const QString & s)
- : node (s.isEmpty () ? 0L : trieInsert (s.utf8 ().data ()))
+ : node (s.isEmpty () ? 0L : trieInsert (s.utf8 ().constData ()))
{}
TrieString::TrieString (const char * utf8)
--- trunk/extragear/multimedia/kmplayer/src/viewarea.cpp #769229:769230
@@ -773,7 +773,7 @@
last_line = line;
int ppos = 0;
while (true) {
- cairo_text_extents (cr, line->txt.utf8 ().data (), &line->txt_ext);
+ cairo_text_extents (cr, line->txt.utf8 ().constData (), \
&line->txt_ext); float frag = line->txt_ext.width > 0.1
? w / line->txt_ext.width : 1.1;
if (frag < 1.0) {
@@ -784,7 +784,7 @@
if (br_pos < 1)
break;
line->txt.truncate (br_pos);
- cairo_text_extents (cr, line->txt.utf8 ().data (), \
&line->txt_ext); + cairo_text_extents (cr, line->txt.utf8 \
().constData (), &line->txt_ext); if (line->txt_ext.width < (double)w)
break;
}
@@ -832,7 +832,7 @@
Line * line = lines;
line->xoff += Single (txt_fnt.max_x_advance / 4);
cairo_move_to (cr_txt, line->xoff - min_xoff, y1 + Single \
(txt_fnt.ascent));
- cairo_show_text (cr_txt, line->txt.utf8 ().data ());
+ cairo_show_text (cr_txt, line->txt.utf8 ().constData ());
y1 += Single (txt_fnt.height);
lines = lines->next;
delete line;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic