Mercurial > hg > easyhg-kdiff3
comparison kdiff3/src-QT4/main.cpp @ 95:6f42f5bd218e
- OS2-port by Silvan Scherrer
- Fixed writing to KIO.
- Fix crash on A/B-overview (infinite recursion)
author | joachim99 |
---|---|
date | Sun, 28 Feb 2010 20:32:34 +0000 |
parents | 4e6ebbbae925 |
children | 1b9430d5cf2b |
comparison
equal
deleted
inserted
replaced
94:b2f22ae5f810 | 95:6f42f5bd218e |
---|---|
148 { | 148 { |
149 return ::_spawnvp(_P_WAIT , "cleardiffmrg_orig", argv ); | 149 return ::_spawnvp(_P_WAIT , "cleardiffmrg_orig", argv ); |
150 } | 150 } |
151 | 151 |
152 #endif | 152 #endif |
153 #ifdef Q_OS_OS2 | |
154 // expand wildcards on the command line | |
155 _wildcard(&argc, &argv); | |
156 #endif | |
157 | |
153 //QApplication::setColorSpec( QApplication::ManyColor ); // Grab all 216 colors | 158 //QApplication::setColorSpec( QApplication::ManyColor ); // Grab all 216 colors |
154 | 159 |
155 const QByteArray& appName = QByteArray("kdiff3"); | 160 const QByteArray& appName = QByteArray("kdiff3"); |
156 const QByteArray& appCatalog = appName; | 161 const QByteArray& appCatalog = appName; |
157 const KLocalizedString i18nName = ki18n("kdiff3"); | 162 const KLocalizedString i18nName = ki18n("kdiff3"); |