← Back to branch summary

~ubuntu-branches/ubuntu/precise/kde4libs/precise-proposed

« back to all changes in this revision

Viewing changes to kio/kfile/kopenwithdialog.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Kolberg
  • Date: 2012-03-03 00:25:28 UTC
  • mfrom: (1.14.15)
  • Revision ID: package-import@ubuntu.com-20120303002528-chhwyfluldkicy5k
Tags: 4:4.8.1-0ubuntu1
* New upstream release
  - Update symbol files

Show diffs side-by-side

added added

removed removed

Lines of Context:
kio/kfile/kopenwithdialog.cpp
366
366
void KApplicationView::setModel(QAbstractItemModel *model)
367
367
{
368
368
    if (d->appModel) {
369
 
        disconnect(selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
370
 
                this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection)));
 
369
        disconnect(selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
 
370
                this, SLOT(slotSelectionChanged(QItemSelection,QItemSelection)));
371
371
    }
372
372
 
373
373
    QTreeView::setModel(model);
374
374
 
375
375
    d->appModel = qobject_cast<KApplicationModel*>(model);
376
376
    if (d->appModel) {
377
 
        connect(selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
378
 
                this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection)));
 
377
        connect(selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
 
378
                this, SLOT(slotSelectionChanged(QItemSelection,QItemSelection)));
379
379
    }
380
380
}
381
381
 
626
626
    topLayout->addWidget(view);
627
627
    topLayout->setStretchFactor(view, 1);
628
628
 
629
 
    QObject::connect(view, SIGNAL(selected(QString, QString)),
630
 
                     q, SLOT(slotSelected(QString, QString)));
631
 
    QObject::connect(view, SIGNAL(highlighted(QString, QString)),
632
 
                     q, SLOT(slotHighlighted(QString, QString)));
 
629
    QObject::connect(view, SIGNAL(selected(QString,QString)),
 
630
                     q, SLOT(slotSelected(QString,QString)));
 
631
    QObject::connect(view, SIGNAL(highlighted(QString,QString)),
 
632
                     q, SLOT(slotHighlighted(QString,QString)));
633
633
    QObject::connect(view, SIGNAL(doubleClicked(QModelIndex)),
634
634
                     q, SLOT(_k_slotDbClick()));
635
635
 
900
900
            // If we got here, we can't seem to find a service for what they wanted. Create one.
901
901
 
902
902
            QString menuId;
 
903
#ifdef Q_WS_WIN32
 
904
            // on windows, do not use the complete path, but only the default name.
 
905
            serviceName = QFileInfo(serviceName).fileName();
 
906
#endif
903
907
            QString newPath = KService::newServicePath(false /* ignored argument */, serviceName, &menuId);
904
908
            kDebug(250) << "Creating new service" << serviceName << "(" << newPath << ")" << "menuId=" << menuId;
905
909