|
|
@ -65,7 +65,7 @@ static KCmdLineOptions options2[] =
|
|
|
|
void initialiseCmdLineArgs(std::vector<KCmdLineOptions>& vOptions, TQStringList& ignorableOptions)
|
|
|
|
void initialiseCmdLineArgs(std::vector<KCmdLineOptions>& vOptions, TQStringList& ignorableOptions)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
vOptions.insert( vOptions.end(), options, (KCmdLineOptions*)((char*)options+sizeof(options)));
|
|
|
|
vOptions.insert( vOptions.end(), options, (KCmdLineOptions*)((char*)options+sizeof(options)));
|
|
|
|
TQString configFileName = KStandardDirs().findResource("config","kdiff3rc");
|
|
|
|
TQString configFileName = TDEStandardDirs().findResource("config","kdiff3rc");
|
|
|
|
TQFile configFile( configFileName );
|
|
|
|
TQFile configFile( configFileName );
|
|
|
|
if ( configFile.open( IO_ReadOnly ) )
|
|
|
|
if ( configFile.open( IO_ReadOnly ) )
|
|
|
|
{
|
|
|
|
{
|
|
|
|