@@ -265,8 +265,7 @@ void soundPlay(const QString &s) #else QString player = PsiOptions::instance()->getOption("options.ui.notifications.sounds.unix-sound-player").toString(); if (player == "") player = soundDetectPlayer(); - QStringList args; - args = QStringList::split(' ', player); + QStringList args = player.split(' '); args += str; QString prog = args.takeFirst(); QProcess::startDetached(prog, args); @@ -362,7 +361,8 @@ void x11wmClass(Display *dsp, WId wid, QString resName) //Display *dsp = x11Display(); // get the display //WId win = winId(); // get the window XClassHint classhint; // class hints - classhint.res_name = (char *)resName.latin1(); // res_name + const QByteArray latinResName = resName.toLatin1(); + classhint.res_name = (char *)latinResName.data(); // res_name classhint.res_class = app_name; // res_class XSetClassHint(dsp, wid, &classhint); // set the class hints } src/common.cpp @@ -698,7 +698,7 @@ void EventDlg::init() vb1->setSpacing(4); // first row - QHBoxLayout *hb1 = new QHBoxLayout(0); + QHBoxLayout *hb1 = new QHBoxLayout; hb1->setSpacing(4); vb1->addLayout(hb1); d->lb_identity = new QLabel(tr("Identity:"), this); @@ -724,7 +724,7 @@ void EventDlg::init() updateIdentityVisibility(); // second row - QHBoxLayout *hb2 = new QHBoxLayout(0); + QHBoxLayout *hb2 = new QHBoxLayout; hb2->setSpacing(4); vb1->addLayout(hb2); @@ -821,7 +821,7 @@ void EventDlg::init() if (toolButton) toolButton->setFocusPolicy(Qt::NoFocus); - QHBoxLayout *hb3 = new QHBoxLayout(0); + QHBoxLayout *hb3 = new QHBoxLayout; hb3->setSpacing(4); vb1->addLayout(hb3); @@ -913,7 +913,7 @@ void EventDlg::init() d->xdata_form->hide(); // bottom row - QHBoxLayout *hb4 = new QHBoxLayout(0); + QHBoxLayout *hb4 = new QHBoxLayout; vb1->addLayout(hb4); d->pb_close = new IconButton(this); d->pb_close->setText(tr("&Close")); src/eventdlg.cpp @@ -92,7 +92,7 @@ static void active_file_remove(const QString &s) { if(!activeFiles) return; - activeFiles->remove(s); + activeFiles->removeAll(s); //printf("removed: [%s]\n", s.latin1()); } @@ -343,7 +343,7 @@ void FileTransferHandler::ft_connected() ok = true; } else { - if(d->f.at(d->offset)) + if(d->f.seek(d->offset)) ok = true; } } @@ -370,7 +370,7 @@ void FileTransferHandler::ft_connected() ok = true; } else { - if(d->f.at(d->offset)) + if(d->f.seek(d->offset)) ok = true; } } @@ -381,7 +381,7 @@ void FileTransferHandler::ft_connected() return; } - d->activeFile = d->f.name(); + d->activeFile = d->f.fileName(); active_file_add(d->activeFile); // done already? this means a file size of zero @@ -396,7 +396,7 @@ void FileTransferHandler::ft_readyRead(const QByteArray &a) { if(!d->sending) { //printf("%d bytes read\n", a.size()); - int r = d->f.writeBlock(a.data(), a.size()); + int r = d->f.write(a.data(), a.size()); if(r < 0) { d->f.close(); delete d->ft; @@ -560,7 +560,7 @@ FileRequestDlg::FileRequestDlg(const Jid &jid, PsiCon *psi, PsiAccount *pa, cons d->te = new ChatView(this); d->te->setReadOnly(false); - d->te->setTextFormat(Qt::PlainText); + d->te->setAcceptRichText(false); replaceWidget(te_desc, d->te); setTabOrder(le_fname, d->te); setTabOrder(d->te, pb_stop); @@ -603,7 +603,7 @@ FileRequestDlg::FileRequestDlg(const Jid &jid, PsiCon *psi, PsiAccount *pa, cons return; } - FileUtil::setLastUsedSavePath(fi.dirPath()); + FileUtil::setLastUsedSavePath(fi.path()); le_fname->setText(QDir::convertSeparators(fi.filePath())); lb_size->setText(tr("%1 byte(s)").arg(fi.size())); // TODO: large file support } @@ -645,7 +645,7 @@ FileRequestDlg::FileRequestDlg(const QDateTime &ts, FileTransfer *ft, PsiAccount replaceWidget(lb_accountlabel, hb); d->te = new ChatView(this); - d->te->setTextFormat(Qt::PlainText); + d->te->setAcceptRichText(false); replaceWidget(te_desc, d->te); setTabOrder(le_fname, d->te); setTabOrder(d->te, pb_stop); @@ -813,7 +813,7 @@ void FileRequestDlg::doStart() connect(d->ft, SIGNAL(statusMessage(const QString &)), SLOT(ft_statusMessage(const QString &))); connect(d->ft, SIGNAL(connected()), SLOT(ft_connected())); connect(d->ft, SIGNAL(error(int, int, const QString &)), SLOT(ft_error(int, int, const QString &))); - d->ft->send(le_to->text(), le_fname->text(), d->te->text()); + d->ft->send(le_to->text(), le_fname->text(), d->te->getPlainText()); } else { QString fname, savename; @@ -850,7 +850,8 @@ void FileRequestDlg::doStart() busy->start(); lb_status->setText(tr("Accepting...")); - d->t.start(30000, true); + d->t.setSingleShot(true); + d->t.start(30000); connect(d->ft, SIGNAL(accepted()), SLOT(ft_accepted())); connect(d->ft, SIGNAL(statusMessage(const QString &)), SLOT(ft_statusMessage(const QString &))); @@ -1561,13 +1562,15 @@ FileTransDlg::FileTransDlg(PsiCon *psi) setWindowIcon(IconsetFactory::icon("psi/filemanager").icon()); #endif - QVBoxLayout *vb = new QVBoxLayout(this, 11, 6); + QVBoxLayout *vb = new QVBoxLayout(this); + vb->setSpacing(6); // FIXME: Is forced spacing really necessary? d->lv = new FileTransView(this); connect(d->lv, SIGNAL(itemCancel(int)), SLOT(itemCancel(int))); connect(d->lv, SIGNAL(itemOpenDest(int)), SLOT(itemOpenDest(int))); connect(d->lv, SIGNAL(itemClear(int)), SLOT(itemClear(int))); vb->addWidget(d->lv); - QHBoxLayout *hb = new QHBoxLayout(vb); + QHBoxLayout *hb = new QHBoxLayout; + vb->addLayout(hb); hb->addStretch(1); QPushButton *pb_clear = new QPushButton(tr("Clear &Finished"), this); connect(pb_clear, SIGNAL(clicked()), SLOT(clearFinished())); @@ -1750,9 +1753,9 @@ void FileTransDlg::itemOpenDest(int id) QString path; bool recv = (i->h->mode() == FileTransferHandler::Receiving); if(recv) - path = QFileInfo(i->h->saveName()).dirPath(); + path = QFileInfo(i->h->saveName()).path(); else - path = QFileInfo(i->h->fileName()).dirPath(); + path = QFileInfo(i->h->fileName()).path(); //printf("item open dest: [%s]\n", path.latin1()); } src/filetransdlg.cpp @@ -388,7 +388,7 @@ join <channel>{,<channel>} [pass{,<pass>} version->go(); newstate = 0; } else if (cmd == "idle" && command.count() > 1) { - QString nick = command[1].stripWhiteSpace(); + QString nick = command[1].trimmed(); Jid target = dlg->jid().withResource(nick); LastActivityTask *idle = new LastActivityTask(target, dlg->account()->client()->rootTask()); connect(idle, SIGNAL(finished()), SLOT(lastactivity_finished())); @@ -1835,7 +1835,7 @@ GCFindDlg::GCFindDlg(const QString& str, QWidget* parent) setWindowTitle(tr("Find")); QVBoxLayout *vb = new QVBoxLayout(this); vb->setMargin(4); - QHBoxLayout *hb = new QHBoxLayout(0); + QHBoxLayout *hb = new QHBoxLayout; vb->addLayout(hb); QLabel *l = new QLabel(tr("Find:"), this); hb->addWidget(l); @@ -1849,7 +1849,7 @@ GCFindDlg::GCFindDlg(const QString& str, QWidget* parent) Line1->setFrameShape( QFrame::HLine ); vb->addWidget(Line1); - hb = new QHBoxLayout(0); + hb = new QHBoxLayout; vb->addLayout(hb); hb->addStretch(1); QPushButton *pb_close = new QPushButton(tr("&Close"), this); src/groupchatdlg.cpp @@ -129,7 +129,6 @@ public: }; HistoryDlg::HistoryDlg(const Jid &jid, PsiAccount *pa) - : QWidget(0, 0) { setAttribute(Qt::WA_DeleteOnClose); if ( PsiOptions::instance()->getOption("options.ui.mac.use-brushed-metal-windows").toBool() ) @@ -148,19 +147,23 @@ HistoryDlg::HistoryDlg(const Jid &jid, PsiAccount *pa) d->h = new EDBHandle(d->pa->edb()); connect(d->h, SIGNAL(finished()), SLOT(edb_finished())); - QVBoxLayout *vb1 = new QVBoxLayout(this, 8); + QVBoxLayout *vb1 = new QVBoxLayout(this); d->lv = new HistoryView(this); d->lv->setVScrollBarMode(Q3ScrollView::AlwaysOn); connect(d->lv, SIGNAL(aOpenEvent(PsiEvent *)), SLOT(actionOpenEvent(PsiEvent *))); QSizePolicy sp = d->lv->sizePolicy(); - sp.setVerStretch(1); + sp.setVerticalStretch(1); d->lv->setSizePolicy(sp); vb1->addWidget(d->lv); - QHBoxLayout *hb1 = new QHBoxLayout(vb1); + QHBoxLayout *hb1 = new QHBoxLayout; + vb1->addLayout(hb1); - QVBoxLayout *vb2 = new QVBoxLayout(hb1); - QHBoxLayout *hb2 = new QHBoxLayout(vb2); + QVBoxLayout *vb2 = new QVBoxLayout; + hb1->addLayout(vb2); + + QHBoxLayout *hb2 = new QHBoxLayout; + vb2->addLayout(hb2); //d->busy = new BusyWidget(this); //hb1->addWidget(d->busy); @@ -180,7 +183,8 @@ HistoryDlg::HistoryDlg(const Jid &jid, PsiAccount *pa) connect(d->pb_next, SIGNAL(clicked()), SLOT(doNext())); hb2->addWidget(d->pb_next); - QHBoxLayout *hb3 = new QHBoxLayout(vb2); + QHBoxLayout *hb3 = new QHBoxLayout; + vb2->addLayout(hb3); d->le_find = new QLineEdit(this); connect(d->le_find, SIGNAL(textChanged(const QString &)), SLOT(le_textChanged(const QString &))); @@ -196,7 +200,9 @@ HistoryDlg::HistoryDlg(const Jid &jid, PsiAccount *pa) sep->setFrameShape(QFrame::VLine); hb1->addWidget(sep); - QVBoxLayout *vb3 = new QVBoxLayout(hb1); + QVBoxLayout *vb3 = new QVBoxLayout; + hb1->addLayout(vb3); + QPushButton *pb_save = new QPushButton(tr("&Export..."), this); connect(pb_save, SIGNAL(clicked()), SLOT(doSave())); vb3->addWidget(pb_save); @@ -210,7 +216,8 @@ HistoryDlg::HistoryDlg(const Jid &jid, PsiAccount *pa) hb1->addStretch(1); - QVBoxLayout *vb4 = new QVBoxLayout(hb1); + QVBoxLayout *vb4 = new QVBoxLayout; + hb1->addLayout(vb4); vb4->addStretch(1); QPushButton *pb_close = new QPushButton(tr("&Close"), this); @@ -507,7 +514,7 @@ void HistoryDlg::exportHistory(const QString &fname) MessageEvent *me = (MessageEvent *)e; stream << heading << endl; - QStringList lines = QStringList::split('\n', me->message().body(), true); + QStringList lines = me->message().body().split('\n', QString::KeepEmptyParts); foreach(const QString& str, lines) { QStringList sub = wrapString(str, 72); foreach(const QString& str2, sub) { src/historydlg.cpp @@ -98,8 +98,7 @@ InfoDlg::InfoDlg(int type, const Jid &j, const VCard &vcard, PsiAccount *pa, QWi d->busy = ui_.busy; d->bdayDateFormat = "yyyy-MM-dd"; //FIXME make settings for custom date format, but its ISO now - ui_.te_desc->setTextFormat(Qt::PlainText); - + ui_.te_desc->setAcceptRichText(false); setWindowTitle(d->jid.full()); #ifndef Q_WS_MAC @@ -155,7 +154,7 @@ InfoDlg::InfoDlg(int type, const Jid &j, const VCard &vcard, PsiAccount *pa, QWi connect(d->pa->client(), SIGNAL(resourceUnavailable(const Jid &, const Resource &)), SLOT(contactUnavailable(const Jid &, const Resource &))); connect(d->pa,SIGNAL(updateContact(const Jid&)),SLOT(contactUpdated(const Jid&))); ui_.te_status->setReadOnly(true); - ui_.te_status->setTextFormat(Qt::RichText); + ui_.te_status->setAcceptRichText(true); PsiRichText::install(ui_.te_status->document()); updateStatus(); foreach(UserListItem* u, d->pa->findRelevant(j)) { @@ -395,7 +394,7 @@ void InfoDlg::setEdited(bool x) ui_.le_orgName->setModified(x); ui_.le_orgUnit->setModified(x); ui_.le_title->setModified(x); - ui_.le_role->setEdited(x); + ui_.le_role->setModified(x); d->te_edited = x; } @@ -590,7 +589,7 @@ VCard InfoDlg::makeVCard() v.setTitle( ui_.le_title->text() ); v.setRole( ui_.le_role->text() ); - v.setDesc( ui_.te_desc->text() ); + v.setDesc( ui_.te_desc->toPlainText() ); return v; } @@ -732,7 +731,7 @@ void InfoDlg::contactAvailable(const Jid &j, const Resource &r) void InfoDlg::contactUnavailable(const Jid &j, const Resource &r) { if (d->jid.compare(j,false)) { - d->infoRequested.remove(j.withResource(r.name()).full()); + d->infoRequested.removeAll(j.withResource(r.name()).full()); } } src/infodlg.cpp @@ -924,18 +924,18 @@ void MainWin::buildTrayMenu() d->trayMenu->clear(); if(d->nextAmount > 0) { - d->trayMenu->insertItem(tr("Receive next event"), this, SLOT(doRecvNextEvent())); + d->trayMenu->addAction(tr("Receive next event"), this, SLOT(doRecvNextEvent())); d->trayMenu->addSeparator(); } if(isHidden()) { - d->trayMenu->insertItem(tr("Un&hide"), this, SLOT(trayShow())); + d->trayMenu->addAction(tr("Un&hide"), this, SLOT(trayShow())); } else { - d->trayMenu->insertItem(tr("&Hide"), this, SLOT(trayHide())); + d->trayMenu->addAction(tr("&Hide"), this, SLOT(trayHide())); } d->optionsButton->addTo(d->trayMenu); - d->trayMenu->insertItem(tr("Status"), d->statusMenu); + d->trayMenu->addMenu(d->statusMenu); d->trayMenu->addSeparator(); // TODO! src/mainwin.cpp @@ -344,7 +344,8 @@ void OptionsDlg::Private::openTab(QString id) // TODO: how about QScrollView for large tabs? // idea: maybe do it only for those, whose sizeHint is bigger than ws_tabs' - QWidget *w = new QWidget(dlg->ws_tabs, "QWidgetStack/tab"); + QWidget *w = new QWidget(dlg->ws_tabs); + w->setObjectName("QWidgetStack/tab"); QVBoxLayout *vbox = new QVBoxLayout(w); vbox->setSpacing(0); vbox->setMargin(0); src/options/optionsdlg.cpp @@ -24,18 +24,19 @@ */ #include <QFileDialog> -#include <qinputdialog.h> -#include <qtimer.h> -#include <qmessagebox.h> -#include <qpointer.h> -#include <qapplication.h> -#include <qpushbutton.h> -#include <qlayout.h> +#include <QInputDialog> +#include <QTimer> +#include <QMessageBox> +#include <QPointer> +#include <QApplication> +#include <QPushButton> +#include <QLayout> #include <QUrl> -#include <qobject.h> -#include <qmap.h> +#include <QObject> +#include <QMap> #include <qca.h> -#include <qfileinfo.h> +#include <QFileInfo> +#include <QIcon> #include <QPixmap> #include <QFrame> #include <QList> @@ -2994,16 +2995,16 @@ ChatDlg *PsiAccount::ensureChatDlg(const Jid &j) if ( PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool() ) window = d->tabManager->getManagingTabs(c); if(window && window->isHidden()) { - const QPixmap *pp = c->icon(); + QPixmap pp = c->windowIcon().pixmap(16,16); // FIXME: 16x16 is just a guess of what size old QWidget::icon() used QPixmap p; - if(pp) - p = *pp; + if(!pp.isNull()) + p = pp; #ifdef __GNUC__ #warning "Removed reparenting call from qwextend" #endif //reparent_good(window, 0, false); if(!p.isNull()) - c->setIcon(p); + c->setWindowIcon(p); } #endif } src/psiaccount.cpp @@ -119,7 +119,7 @@ PsiOptionsEditor::PsiOptionsEditor(QWidget *parent) tv_->resizeColumnToContents(0); tv_colWidth = tv_->columnWidth(0); - QHBoxLayout *infoLine = new QHBoxLayout(0); + QHBoxLayout *infoLine = new QHBoxLayout; layout->addLayout(infoLine); lb_path = new QLabel(this); lb_path->setTextInteractionFlags(Qt::TextSelectableByMouse); @@ -144,7 +144,7 @@ PsiOptionsEditor::PsiOptionsEditor(QWidget *parent) layout->addWidget(lb_comment); - QHBoxLayout* buttonLine = new QHBoxLayout(0); + QHBoxLayout* buttonLine = new QHBoxLayout; layout->addLayout(buttonLine); cb_ = new QCheckBox(this); src/psioptionseditor.cpp @@ -378,7 +378,7 @@ void PsiPopup::setData(const Jid &j, const Resource &r, const UserListItem *u, c if ( d->popupType != AlertHeadline && (d->popupType != AlertFile || !PsiOptions::instance()->getOption("options.ui.file-transfer.auto-popup").toBool()) ) setData(icon, contactText); else if ( d->popupType == AlertHeadline ) { - QVBoxLayout *vbox = new QVBoxLayout(0); + QVBoxLayout *vbox = new QVBoxLayout; vbox->addLayout( d->createContactInfo(icon, contactText) ); vbox->addSpacing(5); src/psipopup.cpp @@ -113,14 +113,13 @@ QPixmap PsiTrayIcon::makeIcon() #ifdef Q_WS_X11 // on X11, the KDE dock is 22x22. let's make our icon_ "seem" bigger. - QImage real(22,22,32); + QImage real(22,22,QImage::Format_ARGB32); QImage in = icon_->image(); in.detach(); - real.setAlphaBuffer(true); // make sure it is no bigger than 16x16 if(in.width() > 16 || in.height() > 16) - in = in.smoothScale(16,16); + in = in.scaled(16,16,Qt::IgnoreAspectRatio,Qt::SmoothTransformation); int xo = (real.width() - in.width()) / 2; int yo = (real.height() - in.height()) / 2; @@ -155,9 +154,7 @@ QPixmap PsiTrayIcon::makeIcon() } } - QPixmap pixmap; - pixmap.convertFromImage(real); - return pixmap; + return QPixmap::fromImage(real); #else return icon_->pixmap(); #endif src/psitrayicon.cpp @@ -174,7 +174,7 @@ RegistrationDlg::RegistrationDlg(const Jid &jid, PsiAccount *pa) line->setFrameStyle(QFrame::HLine | QFrame::Sunken); vb1->addWidget(line); - QHBoxLayout *hb1 = new QHBoxLayout(0); + QHBoxLayout *hb1 = new QHBoxLayout; vb1->addLayout(hb1); d->busy = new BusyWidget(this); hb1->addWidget(d->busy); src/registrationdlg.cpp @@ -52,7 +52,7 @@ ShowTextDlg::ShowTextDlg(const QString &fname, bool rich, QWidget *parent) vb1->addWidget(te); - QHBoxLayout *hb1 = new QHBoxLayout(0); + QHBoxLayout *hb1 = new QHBoxLayout; vb1->addLayout(hb1); hb1->addStretch(1); QPushButton *pb = new QPushButton(tr("&OK"), this); @@ -79,7 +79,7 @@ ShowTextDlg::ShowTextDlg(const QString &text, bool nonfile, bool rich, QWidget * vb1->addWidget(te); - QHBoxLayout *hb1 = new QHBoxLayout(0); + QHBoxLayout *hb1 = new QHBoxLayout; vb1->addLayout(hb1); hb1->addStretch(1); QPushButton *pb = new QPushButton(tr("&OK"), this); src/showtextdlg.cpp @@ -56,7 +56,7 @@ StatusShowDlg::StatusShowDlg(const UserListItem &u) vb->setMargin(8); PsiTextView *te = new PsiTextView(this); vb->addWidget(te); - QHBoxLayout *hb = new QHBoxLayout(0); + QHBoxLayout *hb = new QHBoxLayout; vb->addLayout(hb); QPushButton *pb = new QPushButton(tr("&Close"), this); connect(pb, SIGNAL(clicked()), SLOT(close())); @@ -130,7 +130,7 @@ void StatusSetDlg::init() // build the dialog QVBoxLayout *vb = new QVBoxLayout(this); vb->setMargin(8); - QHBoxLayout *hb1 = new QHBoxLayout(0); + QHBoxLayout *hb1 = new QHBoxLayout; vb->addLayout(hb1); // Status @@ -167,7 +167,7 @@ void StatusSetDlg::init() d->te->setAcceptRichText(false); d->te->setMinimumHeight(50); vb->addWidget(d->te); - QHBoxLayout *hb = new QHBoxLayout(0); + QHBoxLayout *hb = new QHBoxLayout; vb->addLayout(hb); QPushButton *pb1 = new QPushButton(tr("&Set"), this); QPushButton *pb2 = new QPushButton(tr("&Cancel"), this); src/statusdlg.cpp @@ -135,7 +135,7 @@ static QString unixHeuristicDetect() { f.readLine( buffer, 128 ); QString desc(buffer); - desc = desc.stripWhiteSpace (); + desc = desc.trimmed(); switch ( osInfo[i].flags ) { case OsUseFile: src/systeminfo.cpp @@ -5,7 +5,7 @@ #include <QKeySequence> #include <QBuffer> -#include "optionstree.h"; +#include "optionstree.h" #include "varianttree.h" #include "xmpp/base64/base64.h" src/tools/optionstree/optionstreewriter.cpp @@ -260,7 +260,7 @@ public: QHBoxLayout *frameLayout = new QHBoxLayout(frame); frameLayout->setMargin(0); frameLayout->setSpacing(0); - QVBoxLayout *layout = new QVBoxLayout(0); + QVBoxLayout *layout = new QVBoxLayout; layout->setMargin(0); layout->setSpacing(0); frameLayout->addLayout( layout ); src/widgets/fancylabel.cpp @@ -186,7 +186,7 @@ void FancyPopup::Private::initContents(QString title, const PsiIcon *icon, bool vbox->setSpacing(0); // top row - QHBoxLayout *tophbox = new QHBoxLayout(0); + QHBoxLayout *tophbox = new QHBoxLayout; vbox->addLayout(tophbox); QLabel *top1 = new QLabel(popup); top1->setAutoFillBackground(true); @@ -194,7 +194,7 @@ void FancyPopup::Private::initContents(QString title, const PsiIcon *icon, bool top1->setPalette(backgroundPalette); tophbox->addWidget(top1); - QVBoxLayout *topvbox = new QVBoxLayout(0); + QVBoxLayout *topvbox = new QVBoxLayout; tophbox->addLayout(topvbox); QLabel *top2 = new QLabel(popup); top2->setAutoFillBackground(true); @@ -202,7 +202,7 @@ void FancyPopup::Private::initContents(QString title, const PsiIcon *icon, bool top2->setPalette(backgroundPalette); topvbox->addWidget(top2); - QHBoxLayout *tophbox2 = new QHBoxLayout(0); + QHBoxLayout *tophbox2 = new QHBoxLayout; topvbox->addLayout(tophbox2); IconLabel *titleIcon = new IconLabel(popup); @@ -276,7 +276,7 @@ void FancyPopup::Private::initContents(QString title, const PsiIcon *icon, bool tophbox->addWidget(top4); // middle row - QHBoxLayout *middlehbox = new QHBoxLayout(0); + QHBoxLayout *middlehbox = new QHBoxLayout; vbox->addLayout(middlehbox); QLabel *middle1 = new QLabel(popup); middle1->setAutoFillBackground(true); @@ -285,7 +285,7 @@ void FancyPopup::Private::initContents(QString title, const PsiIcon *icon, bool middlehbox->addWidget(middle1); middlehbox->addSpacing(5); - QVBoxLayout *middlevbox = new QVBoxLayout(0); + QVBoxLayout *middlevbox = new QVBoxLayout; middlehbox->addLayout(middlevbox); middlevbox->addSpacing(5); layout = middlevbox; // we'll add more items later in addLayout() @@ -298,7 +298,7 @@ void FancyPopup::Private::initContents(QString title, const PsiIcon *icon, bool middlehbox->addWidget(middle3); // bottom row - QHBoxLayout *bottomhbox = new QHBoxLayout(0); + QHBoxLayout *bottomhbox = new QHBoxLayout; vbox->addLayout(bottomhbox); QLabel *bottom1 = new QLabel(popup); bottom1->setAutoFillBackground(true); src/widgets/fancypopup.cpp @@ -40,7 +40,7 @@ PsiTabWidget::PsiTabWidget(QWidget *parent) layout_ = new QVBoxLayout(this); layout_->setMargin(0); layout_->setSpacing(0); - barLayout_ = new QHBoxLayout(0); + barLayout_ = new QHBoxLayout; layout_->addLayout(barLayout_); barLayout_->setMargin(0); barLayout_->setSpacing(0); src/widgets/psitabwidget.cpp @@ -185,7 +185,7 @@ XmlPrompt::XmlPrompt(QWidget *parent) te->setAcceptRichText(false); vb1->addWidget(te); - QHBoxLayout *hb1 = new QHBoxLayout(0); + QHBoxLayout *hb1 = new QHBoxLayout; vb1->addLayout(hb1); QPushButton *pb; src/xmlconsole.cpp f2c48155d785ac1ae4e41b9ed97c29b762246402 Michail Pishchagin mblsha@users.sourceforge.net http://github.com/mblsha/psi/commit/621182c561a4c11ecbfaee55f8770a35d74f2588 621182c561a4c11ecbfaee55f8770a35d74f2588 2009-11-04T10:40:16-08:00 2009-11-04T10:17:09-08:00 More de-qt3support-ization. Thanks to Constantin Makshin for the patch. be7e25c50a039efe3f22ee82f9be797f950b8bb7 Michail Pishchagin mblsha@users.sourceforge.net