Commit 2166051b authored by Scott Wheeler's avatar Scott Wheeler

CVS_SILENT more name cleanups

svn path=/trunk/kdemultimedia/juk/; revision=212471
parent 33e19d67
......@@ -27,10 +27,10 @@
#include "listboxpixmap.h"
class ListBoxPixmap::m_ListBoxPixmapPrivate
class ListBoxPixmap::ListBoxPixmapPrivate
{
public:
m_ListBoxPixmapPrivate() {
ListBoxPixmapPrivate() {
orientation = Qt::Horizontal;
lineCount = 1;
}
......@@ -77,12 +77,12 @@ ListBoxPixmap::ListBoxPixmap(QListBox *listbox, const QPixmap &pix, const QStrin
ListBoxPixmap::~ListBoxPixmap()
{
delete m_d;
delete d;
}
int ListBoxPixmap::width(const QListBox *listbox) const
{
if(m_d->orientation == Qt::Horizontal)
if(d->orientation == Qt::Horizontal)
return QListBoxPixmap::width(listbox);
return listbox->viewport()->width();
......@@ -90,21 +90,21 @@ int ListBoxPixmap::width(const QListBox *listbox) const
int ListBoxPixmap::height(const QListBox *listbox) const
{
if(m_d->orientation == Qt::Horizontal)
if(d->orientation == Qt::Horizontal)
return QListBoxPixmap::height(listbox);
int min = listbox->fontMetrics().lineSpacing() * m_d->lineCount + pixmap()->height() + 6;
int min = listbox->fontMetrics().lineSpacing() * d->lineCount + pixmap()->height() + 6;
return min;
}
Qt::Orientation ListBoxPixmap::orientation() const
{
return m_d->orientation;
return d->orientation;
}
void ListBoxPixmap::setOrientation(Qt::Orientation o)
{
m_d->orientation = o;
d->orientation = o;
listBox()->repaint();
}
......@@ -112,7 +112,7 @@ void ListBoxPixmap::paint(QPainter *painter)
{
// If we're using the default orientation, use the default paint method.
if( m_d->orientation == Qt::Horizontal ) {
if( d->orientation == Qt::Horizontal ) {
QListBoxPixmap::paint( painter );
return;
}
......@@ -152,8 +152,8 @@ void ListBoxPixmap::paint(QPainter *painter)
lines.append( line.mid( 0, textLength ).stripWhiteSpace() );
line = line.mid( textLength );
}
if( m_d->lineCount != lines.count() ) {
m_d->lineCount = lines.count();
if( d->lineCount != lines.count() ) {
d->lineCount = lines.count();
listBox()->triggerUpdate( true );
}
......@@ -175,5 +175,5 @@ void ListBoxPixmap::paint(QPainter *painter)
void ListBoxPixmap::init()
{
m_d = new m_ListBoxPixmapPrivate();
d = new ListBoxPixmapPrivate();
}
......@@ -55,8 +55,8 @@ protected:
private:
void init();
class m_ListBoxPixmapPrivate;
m_ListBoxPixmapPrivate *m_d;
class ListBoxPixmapPrivate;
ListBoxPixmapPrivate *d;
};
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment