feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fixes: Use common default for lower casing file names

Browse Source
This commit is contained in:
Friedemann Kleint
2009-03-18 17:05:48 +01:00
parent bccf4a1fc3
commit 70cf2c76a5
6 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/utils/classnamevalidatinglineedit.cpp
View File

@@ -51,7 +51,7 @@ ClassNameValidatingLineEditPrivate:: ClassNameValidatingLineEditPrivate() :
m_nameRegexp(QLatin1String("[a-zA-Z_][a-zA-Z0-9_]*(::[a-zA-Z_][a-zA-Z0-9_]*)*")), m_nameRegexp(QLatin1String("[a-zA-Z_][a-zA-Z0-9_]*(::[a-zA-Z_][a-zA-Z0-9_]*)*")),
m_namespaceDelimiter(QLatin1String("::")), m_namespaceDelimiter(QLatin1String("::")),
m_namespacesEnabled(false), m_namespacesEnabled(false),
m_lowerCaseFileName(false) m_lowerCaseFileName(true)
{ {
QTC_ASSERT(m_nameRegexp.isValid(), return); QTC_ASSERT(m_nameRegexp.isValid(), return);
} }

9
src/plugins/cppeditor/cppclasswizard.cpp
View File

@@ -94,10 +94,11 @@ ClassNamePage::ClassNamePage(QWidget *parent) :
// Retrieve settings of CppTools plugin. // Retrieve settings of CppTools plugin.
static inline bool lowerCaseFiles(const Core::ICore *core) static inline bool lowerCaseFiles(const Core::ICore *core)
{ {
QString camelCaseSettingsKey = QLatin1String(CppTools::Constants::CPPTOOLS_SETTINGSGROUP); QString lowerCaseSettingsKey = QLatin1String(CppTools::Constants::CPPTOOLS_SETTINGSGROUP);
camelCaseSettingsKey += QLatin1Char('/'); lowerCaseSettingsKey += QLatin1Char('/');
camelCaseSettingsKey += QLatin1String(CppTools::Constants::LOWERCASE_CPPFILES_KEY); lowerCaseSettingsKey += QLatin1String(CppTools::Constants::LOWERCASE_CPPFILES_KEY);
return core->settings()->value(camelCaseSettingsKey, QVariant(false)).toBool(); const bool lowerCaseDefault = CppTools::Constants::lowerCaseFilesDefault;
return core->settings()->value(lowerCaseSettingsKey, QVariant(lowerCaseDefault)).toBool();
} }
// Set up new class widget from settings // Set up new class widget from settings

3
src/plugins/cpptools/cppfilesettingspage.cpp
View File

@@ -64,7 +64,8 @@ void CppFileSettings::fromSettings(QSettings *s)
s->beginGroup(QLatin1String(Constants::CPPTOOLS_SETTINGSGROUP)); s->beginGroup(QLatin1String(Constants::CPPTOOLS_SETTINGSGROUP));
headerSuffix= s->value(QLatin1String(headerSuffixKeyC), QLatin1String("h")).toString(); headerSuffix= s->value(QLatin1String(headerSuffixKeyC), QLatin1String("h")).toString();
sourceSuffix = s->value(QLatin1String(sourceSuffixKeyC), QLatin1String("cpp")).toString(); sourceSuffix = s->value(QLatin1String(sourceSuffixKeyC), QLatin1String("cpp")).toString();
lowerCaseFiles = s->value(QLatin1String(Constants::LOWERCASE_CPPFILES_KEY), QVariant(true)).toBool(); const bool lowerCaseDefault = Constants::lowerCaseFilesDefault;
lowerCaseFiles = s->value(QLatin1String(Constants::LOWERCASE_CPPFILES_KEY), QVariant(lowerCaseDefault)).toBool();
s->endGroup(); s->endGroup();
} }

1
src/plugins/cpptools/cpptoolsconstants.h
View File

@@ -46,6 +46,7 @@ const char * const CPP_HEADER_MIMETYPE = "text/x-c++hdr";
// QSettings keys for use by the "New Class" wizards. // QSettings keys for use by the "New Class" wizards.
const char * const CPPTOOLS_SETTINGSGROUP = "CppTools"; const char * const CPPTOOLS_SETTINGSGROUP = "CppTools";
const char * const LOWERCASE_CPPFILES_KEY = "LowerCaseFiles"; const char * const LOWERCASE_CPPFILES_KEY = "LowerCaseFiles";
enum { lowerCaseFilesDefault = 1 };
const char * const CPP_SETTINGS_ID = QT_TRANSLATE_NOOP("CppTools", "File naming conventions"); const char * const CPP_SETTINGS_ID = QT_TRANSLATE_NOOP("CppTools", "File naming conventions");
const char * const CPP_SETTINGS_CATEGORY = QT_TRANSLATE_NOOP("CppTools", "C++"); const char * const CPP_SETTINGS_CATEGORY = QT_TRANSLATE_NOOP("CppTools", "C++");

9
src/plugins/designer/cpp/formclasswizard.cpp
View File

@@ -67,10 +67,11 @@ QString FormClassWizard::formSuffix() const
// Retrieve settings of CppTools plugin. // Retrieve settings of CppTools plugin.
static inline bool lowerCaseFiles() static inline bool lowerCaseFiles()
{ {
QString camelCaseSettingsKey = QLatin1String(CppTools::Constants::CPPTOOLS_SETTINGSGROUP); QString lowerCaseSettingsKey = QLatin1String(CppTools::Constants::CPPTOOLS_SETTINGSGROUP);
camelCaseSettingsKey += QLatin1Char('/'); lowerCaseSettingsKey += QLatin1Char('/');
camelCaseSettingsKey += QLatin1String(CppTools::Constants::LOWERCASE_CPPFILES_KEY); lowerCaseSettingsKey += QLatin1String(CppTools::Constants::LOWERCASE_CPPFILES_KEY);
return Core::ICore::instance()->settings()->value(camelCaseSettingsKey, QVariant(false)).toBool(); const bool lowerCaseDefault = CppTools::Constants::lowerCaseFilesDefault;
return Core::ICore::instance()->settings()->value(lowerCaseSettingsKey, QVariant(lowerCaseDefault)).toBool();
} }
QWizard *FormClassWizard::createWizardDialog(QWidget *parent, QWizard *FormClassWizard::createWizardDialog(QWidget *parent,

1
src/plugins/designer/cpp/formclasswizardpage.cpp
View File

@@ -84,6 +84,7 @@ static inline bool lowerCaseFiles(const Core::ICore *core)
QString camelCaseSettingsKey = QLatin1String(CppTools::Constants::CPPTOOLS_SETTINGSGROUP); QString camelCaseSettingsKey = QLatin1String(CppTools::Constants::CPPTOOLS_SETTINGSGROUP);
camelCaseSettingsKey += QLatin1Char('/'); camelCaseSettingsKey += QLatin1Char('/');
camelCaseSettingsKey += QLatin1String(CppTools::Constants::LOWERCASE_CPPFILES_KEY); camelCaseSettingsKey += QLatin1String(CppTools::Constants::LOWERCASE_CPPFILES_KEY);
return core->settings()->value(camelCaseSettingsKey, QVariant(false)).toBool(); return core->settings()->value(camelCaseSettingsKey, QVariant(false)).toBool();
} }