Migrate to new @UserConfig annotation.

src/main/java/com/dmdirc/ClientModule.java

@@ -80,11 +80,6 @@ import dagger.Provides;
         library = true)
 public class ClientModule {
 
-    /** Qualifier that identities the user settings config provider. */
-    @Qualifier
-    public @interface UserConfig {
-    }
-
     /** Qualifier that identities the addon defaults config provider. */
     @Qualifier
     public @interface AddonConfig {

src/main/java/com/dmdirc/ServerFactoryImpl.java

@@ -24,6 +24,7 @@ package com.dmdirc;
 
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.ServerCommandParser;
+import com.dmdirc.config.UserConfig;
 import com.dmdirc.config.profiles.Profile;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.EventBus;
@@ -69,7 +70,7 @@ public class ServerFactoryImpl {
             final Provider<CommandController> commandController,
             final EventBus eventBus,
             final MessageEncoderFactory messageEncoderFactory,
-            @ClientModule.UserConfig final ConfigProvider userSettings,
+            @UserConfig final ConfigProvider userSettings,
             final BackBufferFactory backBufferFactory,
             final GroupChatManagerImplFactory groupChatManagerFactory,
             final UserManager userManager) {

src/main/java/com/dmdirc/config/ConfigModule.java

@@ -90,12 +90,6 @@ public class ConfigModule {
         return controller.getGlobalConfiguration();
     }
 
-    @Provides
-    @com.dmdirc.ClientModule.UserConfig
-    public ConfigProvider getOldUserConfig(final IdentityController controller) {
-        return controller.getUserSettings();
-    }
-
     @Provides
     @UserConfig
     public ConfigProvider getUserConfig(final IdentityController controller) {

src/main/java/com/dmdirc/ui/core/newserver/CoreNewServerDialogModel.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.ui.core.newserver;
 
-import com.dmdirc.ClientModule.UserConfig;
 import com.dmdirc.config.GlobalConfig;
+import com.dmdirc.config.UserConfig;
 import com.dmdirc.config.profiles.Profile;
 import com.dmdirc.config.profiles.ProfileManager;
 import com.dmdirc.events.ProfileAddedEvent;