Changeset View
Changeset View
Standalone View
Standalone View
src/kdiff3.cpp
Show First 20 Lines • Show All 345 Lines • ▼ Show 20 Line(s) | 197 | #endif | |||
---|---|---|---|---|---|
346 | connect(m_pDirectoryMergeWindow, SIGNAL(updateAvailabilities()), this, SLOT(slotUpdateAvailabilities())); | 346 | connect(m_pDirectoryMergeWindow, SIGNAL(updateAvailabilities()), this, SLOT(slotUpdateAvailabilities())); | ||
347 | connect(m_pDirectoryMergeWindow, &DirectoryMergeWindow::statusBarMessage, this, &KDiff3App::slotStatusMsg); | 347 | connect(m_pDirectoryMergeWindow, &DirectoryMergeWindow::statusBarMessage, this, &KDiff3App::slotStatusMsg); | ||
348 | connect(QApplication::clipboard(), &QClipboard::dataChanged, this, &KDiff3App::slotClipboardChanged); | 348 | connect(QApplication::clipboard(), &QClipboard::dataChanged, this, &KDiff3App::slotClipboardChanged); | ||
349 | m_pDirectoryMergeWindow->initDirectoryMergeActions(this, actionCollection()); | 349 | m_pDirectoryMergeWindow->initDirectoryMergeActions(this, actionCollection()); | ||
350 | 350 | | |||
351 | delete KDiff3Shell::getParser(); | 351 | delete KDiff3Shell::getParser(); | ||
352 | 352 | | |||
353 | if(m_pKDiff3Shell == nullptr) { | 353 | if(m_pKDiff3Shell == nullptr) { | ||
354 | completeInit(); | 354 | completeInit(QString()); | ||
355 | } | 355 | } | ||
356 | } | 356 | } | ||
357 | 357 | | |||
358 | void KDiff3App::completeInit(const QString& fn1, const QString& fn2, const QString& fn3) | 358 | void KDiff3App::completeInit(const QString& fn1, const QString& fn2, const QString& fn3) | ||
359 | { | 359 | { | ||
360 | if(m_pKDiff3Shell != nullptr) | 360 | if(m_pKDiff3Shell != nullptr) | ||
361 | { | 361 | { | ||
362 | QSize size = m_pOptions->m_geometry; | 362 | QSize size = m_pOptions->m_geometry; | ||
▲ Show 20 Lines • Show All 723 Lines • Show Last 20 Lines |