Mercurial Repositories > eric / file diff

--- a/Globals/__init__.py	Sat Jul 05 11:41:14 2014 +0200
+++ b/Globals/__init__.py	Sat Jul 05 12:13:23 2014 +0200
@@ -15,9 +15,9 @@
 from PyQt5.QtCore import QDir, QLibraryInfo
 
 # names of the various settings objects
-settingsNameOrganization = "Eric5"
-settingsNameGlobal = "eric5"
-settingsNameRecent = "eric5recent"
+settingsNameOrganization = "Eric6"
+settingsNameGlobal = "eric6"
+settingsNameRecent = "eric6recent"
 
 # key names of the various recent entries
 recentNameMultiProject = "MultiProjects"
@@ -81,7 +81,7 @@
             for vers in BlackLists["sip"] + PlatformBlackLists["sip"]:
                 if vers == sipVersion:
                     print(
-                        'Sorry, sip version {0} is not compatible with eric5.'
+                        'Sorry, sip version {0} is not compatible with eric6.'
                         .format(vers))
                     print('Please install another version.')
                     return False
@@ -96,7 +96,7 @@
         # check for blacklisted versions
         for vers in BlackLists["PyQt5"] + PlatformBlackLists["PyQt5"]:
             if vers == pyqtVersion:
-                print('Sorry, PyQt5 version {0} is not compatible with eric5.'
+                print('Sorry, PyQt5 version {0} is not compatible with eric6.'
                       .format(vers))
                 print('Please install another version.')
                 return False
@@ -112,7 +112,7 @@
             if vers == scintillaVersion:
                 print(
                     'Sorry, QScintilla2 version {0} is not compatible'
-                    ' with eric5.'.format(vers))
+                    ' with eric6.'.format(vers))
                 print('Please install another version.')
                 return False
     
@@ -129,9 +129,9 @@
         hp = configDir
     else:
         if isWindowsPlatform():
-            cdn = "_eric5"
+            cdn = "_eric6"
         else:
-            cdn = ".eric5"
+            cdn = ".eric6"
             
         hp = QDir.homePath()
         dn = QDir(hp)