Remove old pre-INI config migration code

- As if any of this matters now. It's not the 90s anymore.

src/configfile.cpp

@@ -66,15 +66,13 @@ FConfigFile::FConfigFile ()
 //
 //====================================================================
 
-FConfigFile::FConfigFile (const char *pathname,
+FConfigFile::FConfigFile (const char *pathname)
-	void (*nosechandler)(const char *pathname, FConfigFile *config, void *userdata),
-	void *userdata)
 {
 	Sections = CurrentSection = NULL;
 	LastSectionPtr = &Sections;
 	CurrentEntry = NULL;
 	ChangePathName (pathname);
-	LoadConfigFile (nosechandler, userdata);
+	LoadConfigFile ();
 	OkayToWrite = true;
 	FileExisted = true;
 }
@@ -591,7 +589,7 @@ FConfigFile::FConfigEntry *FConfigFile::NewConfigEntry (
 //
 //====================================================================
 
-void FConfigFile::LoadConfigFile (void (*nosechandler)(const char *pathname, FConfigFile *config, void *userdata), void *userdata)
+void FConfigFile::LoadConfigFile ()
 {
 	FILE *file = fopen (PathName, "r");
 	bool succ;
@@ -605,14 +603,6 @@ void FConfigFile::LoadConfigFile (void (*nosechandler)(const char *pathname, FCo
 	succ = ReadConfig (file);
 	fclose (file);
 	FileExisted = succ;
-
-	if (!succ)
-	{ // First valid line did not define a section
-		if (nosechandler != NULL)
-		{
-			nosechandler (PathName, this, userdata);
-		}
-	}
 }
 
 //====================================================================

src/configfile.h

@@ -41,8 +41,7 @@ class FConfigFile
 {
 public:
 	FConfigFile ();
-	FConfigFile (const char *pathname,
+	FConfigFile (const char *pathname);
-		void (*nosechandler)(const char *pathname, FConfigFile *config, void *userdata)=0, void *userdata=NULL);
 	FConfigFile (const FConfigFile &other);
 	virtual ~FConfigFile ();
 
@@ -70,7 +69,7 @@ public:
 	const char *GetPathName () const { return PathName.GetChars(); }
 	void ChangePathName (const char *path);
 
-	void LoadConfigFile (void (*nosechandler)(const char *pathname, FConfigFile *config, void *userdata), void *userdata);
+	void LoadConfigFile ();
 	bool WriteConfigFile () const;
 
 protected:

src/gameconfigfile.cpp

@@ -83,16 +83,10 @@ FGameConfigFile::FGameConfigFile ()
 	FString pathname;
 
 	OkayToWrite = false;	// Do not allow saving of the config before DoGameSetup()
-	bMigrating = false;
 	bModSetup = false;
 	pathname = GetConfigPath (true);
 	ChangePathName (pathname);
-	LoadConfigFile (MigrateStub, NULL);
+	LoadConfigFile ();
-
-	if (!HaveSections ())
-	{ // Config file not found; try the old one
-		MigrateOldConfig ();
-	}
 
 	// If zdoom.ini was read from the program directory, switch
 	// to the user directory now. If it was read from the user
@@ -237,15 +231,6 @@ void FGameConfigFile::WriteCommentHeader (FILE *file) const
 	fprintf (file, "# This file was generated by " GAMENAME " %s on %s\n", GetVersionString(), myasctime());
 }
 
-void FGameConfigFile::MigrateStub (const char *pathname, FConfigFile *config, void *userdata)
-{
-	static_cast<FGameConfigFile *>(config)->bMigrating = true;
-}
-
-void FGameConfigFile::MigrateOldConfig ()
-{
-}
-
 void FGameConfigFile::DoGlobalSetup ()
 {
 	if (SetSection ("GlobalSettings.Unknown"))
@@ -358,10 +343,6 @@ void FGameConfigFile::DoGameSetup (const char *gamename)
 	const char *key;
 	const char *value;
 
-	if (bMigrating)
-	{
-		MigrateOldConfig ();
-	}
 	sublen = countof(section) - 1 - mysnprintf (section, countof(section), "%s.", gamename);
 	subsection = section + countof(section) - sublen - 1;
 	section[countof(section) - 1] = '\0';
@@ -622,41 +603,20 @@ void FGameConfigFile::AddAutoexec (DArgs *list, const char *game)
 
 	mysnprintf (section, countof(section), "%s.AutoExec", game);
 
-	if (bMigrating)
+	// If <game>.AutoExec section does not exist, create it
+	// with a default autoexec.cfg file present.
+	CreateStandardAutoExec(section, false);
+	// Run any files listed in the <game>.AutoExec section
+	if (!SectionIsEmpty())
 	{
-		FBaseCVar *autoexec = FindCVar ("autoexec", NULL);
+		while (NextInSection (key, value))
-
-		if (autoexec != NULL)
 		{
-			UCVarValue val;
+			if (stricmp (key, "Path") == 0 && *value != '\0')
-			char *path;
-
-			val = autoexec->GetGenericRep (CVAR_String);
-			path = copystring (val.String);
-			delete autoexec;
-			SetSection (section, true);
-			SetValueForKey ("Path", path);
-			list->AppendArg (path);
-			delete[] path;
-		}
-	}
-	else
-	{
-		// If <game>.AutoExec section does not exist, create it
-		// with a default autoexec.cfg file present.
-		CreateStandardAutoExec(section, false);
-		// Run any files listed in the <game>.AutoExec section
-		if (!SectionIsEmpty())
-		{
-			while (NextInSection (key, value))
 			{
-				if (stricmp (key, "Path") == 0 && *value != '\0')
+				FString expanded_path = ExpandEnvVars(value);
+				if (FileExists(expanded_path))
 				{
-					FString expanded_path = ExpandEnvVars(value);
+					list->AppendArg (ExpandEnvVars(value));
-					if (FileExists(expanded_path))
-					{
-						list->AppendArg (ExpandEnvVars(value));
-					}
 				}
 			}
 		}
@@ -667,13 +627,6 @@ void FGameConfigFile::SetRavenDefaults (bool isHexen)
 {
 	UCVarValue val;
 
-	if (bMigrating)
-	{
-		con_centernotify.ResetToDefault ();
-		msg0color.ResetToDefault ();
-		color.ResetToDefault ();
-	}
-
 	val.Bool = false;
 	wi_percents.SetGenericRepDefault (val, CVAR_Bool);
 	val.Bool = true;

src/gameconfigfile.h

@@ -60,13 +60,9 @@ protected:
 	void CreateStandardAutoExec (const char *section, bool start);
 
 private:
-	static void MigrateStub (const char *pathname, FConfigFile *config, void *userdata);
-
-	void MigrateOldConfig ();
 	void SetRavenDefaults (bool isHexen);
 	void ReadCVars (DWORD flags);
 
-	bool bMigrating;
 	bool bModSetup;
 
 	char section[64];