diff --git a/coverinfo.cpp b/coverinfo.cpp index 6c8109503d80fb36d58e0ee7f879b0c97e44c7c5..a3aa911a60009bdf773314220cc1a2134b960f6f 100644 --- a/coverinfo.cpp +++ b/coverinfo.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include @@ -45,7 +45,7 @@ struct CoverPopup : public QWidget QLabel *label = new QLabel(this); layout->addWidget(label); - label->setFrameStyle(Q3Frame::Box | Q3Frame::Raised); + label->setFrameStyle(QFrame::Box | QFrame::Raised); label->setLineWidth(1); label->setPixmap(image); diff --git a/filerenamer.cpp b/filerenamer.cpp index 11424a001e3a36cbc23712d360fce666828a19b5..8c1be3befd983b2f296b3d4bf730ddc28f766fc7 100644 --- a/filerenamer.cpp +++ b/filerenamer.cpp @@ -50,7 +50,7 @@ #include #include -#include +#include #include #include @@ -363,14 +363,14 @@ int FileRenamerWidget::addRowCategory(TagType category) frame->setPalette(palette); row.widget = frame; - frame->setFrameShape(Q3Frame::Box); + frame->setFrameShape(QFrame::Box); frame->setLineWidth(1); frame->setMargin(3); m_mainFrame->setStretchFactor(frame, 1); KVBox *buttons = new KVBox(frame); - buttons->setFrameStyle(Q3Frame::Plain | Q3Frame::Box); + buttons->setFrameStyle(QFrame::Plain | QFrame::Box); buttons->setLineWidth(1); row.upButton = new KPushButton(buttons); diff --git a/nowplaying.cpp b/nowplaying.cpp index ebb49cf1c3cba9e101c0d72c63d8be30c4e58563..1e9591406e8f5df0860e0735d6366e7e44a1ad9a 100644 --- a/nowplaying.cpp +++ b/nowplaying.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include @@ -48,9 +48,9 @@ static const int imageSize = 64; -struct Line : public Q3Frame +struct Line : public QFrame { - Line(QWidget *parent) : Q3Frame(parent) { setFrameShape(VLine); } + Line(QWidget *parent) : QFrame(parent) { setFrameShape(VLine); } }; //////////////////////////////////////////////////////////////////////////////// diff --git a/statuslabel.cpp b/statuslabel.cpp index d52c87fbacda0f64491398b4f4ca500feee3e6fd..d45d8ac331eb8da28f0d202a9427246447e4fd25 100644 --- a/statuslabel.cpp +++ b/statuslabel.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include @@ -45,7 +45,7 @@ StatusLabel::StatusLabel(PlaylistInterface *playlist, QWidget *parent) : PlaylistObserver(playlist), m_showTimeRemaining(false) { - Q3Frame *trackAndPlaylist = new Q3Frame(this); + QFrame *trackAndPlaylist = new QFrame(this); trackAndPlaylist->setFrameStyle(Box | Sunken); trackAndPlaylist->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); diff --git a/systemtray.cpp b/systemtray.cpp index 566299404574df9f2f6eb1011d15fbed9ddc8dc0..72cfa44bebaf00702536667991e7ea8fb63473ce 100644 --- a/systemtray.cpp +++ b/systemtray.cpp @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include @@ -508,8 +508,8 @@ void SystemTray::slotForward() void SystemTray::addSeparatorLine(QWidget *parent) { - Q3Frame *line = new Q3Frame(parent); - line->setFrameShape(Q3Frame::VLine); + QFrame *line = new QFrame(parent); + line->setFrameShape(QFrame::VLine); // Cover art takes up 80 pixels, make sure we take up at least 80 pixels // even if we don't show the cover art for consistency.