Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

r14.0.x
Timothy Pearson 12 years ago
parent 2138755a6d
commit 4ff6dfc573

@ -46,7 +46,7 @@ static KCmdLineOptions options[] = {
static const char version[] = "1.4.2"; static const char version[] = "1.4.2";
void applyFilterArgs(KCmdLineArgs* args, FileViewController* controller) { void applyFilterArgs(TDECmdLineArgs* args, FileViewController* controller) {
TQString filterType = args->getOption("filter-type"); TQString filterType = args->getOption("filter-type");
TQString filterName = args->getOption("filter-name"); TQString filterName = args->getOption("filter-name");
TQString filterFrom = args->getOption("filter-from"); TQString filterFrom = args->getOption("filter-from");
@ -126,15 +126,15 @@ KDE_EXPORT int kdemain (int argc, char *argv[]) {
aboutData.addCredit("Michael Spanier", I18N_NOOP("Patch for mouse navigation (v0.7.0)"), "mail@michael-spanier.de"); aboutData.addCredit("Michael Spanier", I18N_NOOP("Patch for mouse navigation (v0.7.0)"), "mail@michael-spanier.de");
aboutData.addCredit("Christian A Strømmen", I18N_NOOP("Integration in Konqueror folder context menu"), "number1@realityx.net"); aboutData.addCredit("Christian A Strømmen", I18N_NOOP("Integration in Konqueror folder context menu"), "number1@realityx.net");
KCmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
KCmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication kapplication; KApplication kapplication;
if (kapplication.isRestored()) { if (kapplication.isRestored()) {
RESTORE(MainWindow) RESTORE(MainWindow)
} else { } else {
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
MainWindow *mainWindow = new MainWindow; MainWindow *mainWindow = new MainWindow;
applyFilterArgs(args, mainWindow->fileViewController()); applyFilterArgs(args, mainWindow->fileViewController());

@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
KAboutData aboutData("testvtabwidget", "testvtabwidget", "0"); KAboutData aboutData("testvtabwidget", "testvtabwidget", "0");
KCmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
KApplication app; KApplication app;
Gwenview::VTabWidget tabWidget(0); Gwenview::VTabWidget tabWidget(0);

@ -202,7 +202,7 @@ int main(int argc, char* argv[]) {
TestEnvironment testEnv; TestEnvironment testEnv;
bool result; bool result;
KAboutData aboutData("testjpegcontent", "testjpegcontent", "0"); KAboutData aboutData("testjpegcontent", "testjpegcontent", "0");
KCmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
KApplication kapplication; KApplication kapplication;
// Reading info // Reading info

Loading…
Cancel
Save