Commit 2de65b8f authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Fix typo. Rename data file as kde.categories etc.

Thanks David for review
parent 299b6ed5
......@@ -34,6 +34,6 @@ add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII")
add_subdirectory( src )
add_subdirectory( autotests )
install( FILES data/qdebug.areas DESTINATION ${KDE_INSTALL_CONFDIR} )
install( FILES data/kde.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
......@@ -51,6 +51,7 @@ void KDeApplicationDebugSettingPageTest::shouldHaveDefaultValue()
KListWidgetSearchLine *searchLine = page.findChild<KListWidgetSearchLine *>(QStringLiteral("searchline"));
QVERIFY(searchLine);
QVERIFY(searchLine->text().isEmpty());
}
QTEST_MAIN(KDeApplicationDebugSettingPageTest)
......@@ -33,7 +33,7 @@ KDebugSettingUtilTest::~KDebugSettingUtilTest()
}
void KDebugSettingUtilTest::shouldParseKdeLogginLine_data()
void KDebugSettingUtilTest::shouldParseKdeLoggingLine_data()
{
QTest::addColumn<QString>("input");
QTest::addColumn<QString>("description");
......@@ -48,7 +48,7 @@ void KDebugSettingUtilTest::shouldParseKdeLogginLine_data()
QTest::newRow("badline") << QStringLiteral("log") << QString() << QString() << QString() << false;
}
void KDebugSettingUtilTest::shouldParseKdeLogginLine()
void KDebugSettingUtilTest::shouldParseKdeLoggingLine()
{
QFETCH( QString, input );
QFETCH( QString, description );
......@@ -64,7 +64,7 @@ void KDebugSettingUtilTest::shouldParseKdeLogginLine()
QCOMPARE(cat, result);
}
void KDebugSettingUtilTest::shouldParseQtLogginLine_data()
void KDebugSettingUtilTest::shouldParseQtLoggingLine_data()
{
QTest::addColumn<QString>("input");
QTest::addColumn<QString>("description");
......@@ -88,7 +88,7 @@ void KDebugSettingUtilTest::shouldParseQtLogginLine_data()
QTest::newRow("invalidWithoutEnabledDisabled") << QStringLiteral("dd=") << QString() << QString() << QString() << false;
}
void KDebugSettingUtilTest::shouldParseQtLogginLine()
void KDebugSettingUtilTest::shouldParseQtLoggingLine()
{
QFETCH( QString, input );
QFETCH( QString, description );
......
......@@ -30,11 +30,11 @@ public:
explicit KDebugSettingUtilTest(QObject *parent = 0);
~KDebugSettingUtilTest();
private Q_SLOTS:
void shouldParseKdeLogginLine_data();
void shouldParseKdeLogginLine();
void shouldParseKdeLoggingLine_data();
void shouldParseKdeLoggingLine();
void shouldParseQtLogginLine_data();
void shouldParseQtLogginLine();
void shouldParseQtLoggingLine_data();
void shouldParseQtLoggingLine();
};
#endif // KDEBUGSETTINGUTILTEST_H
# Format : logname<tab>description
# Format : logname<space>description
# kdepim
log_sieveeditor kdepim (sieveeditor)
......
......@@ -48,7 +48,7 @@ KDebugSettingsDialog::KDebugSettingsDialog(QWidget *parent)
mCustomSettingsPage = new CustomDebugSettingsPage(this);
mCustomSettingsPage->setObjectName(QStringLiteral("customsettingspage"));
mTabWidget->addTab(mKdeApplicationSettingsPage, i18n("KDE Application"));
mTabWidget->addTab(mCustomSettingsPage, i18n("Custom"));
mTabWidget->addTab(mCustomSettingsPage, i18n("Custom Rules"));
QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
buttonBox->setObjectName(QStringLiteral("buttonbox"));
......@@ -83,7 +83,7 @@ void KDebugSettingsDialog::saveConfig()
void KDebugSettingsDialog::readCategoriesFiles()
{
// KDE debug categories area
const QString confAreasFile = QStandardPaths::locate(QStandardPaths::ConfigLocation, QLatin1Literal("qdebug.areas"));
const QString confAreasFile = QStandardPaths::locate(QStandardPaths::ConfigLocation, QLatin1Literal("kde.categories"));
Category::List categories = KDebugSettingsUtil::readLoggingCategories(confAreasFile);
// qt logging.ini
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment