Commit 274d42e5 authored by David Jarvie's avatar David Jarvie
Browse files

Krazy fixes

parent bec5a03c
......@@ -61,7 +61,7 @@ private Q_SLOTS:
void checkIfComplete();
private:
FileResourceMigrator(QObject* parent = nullptr);
explicit FileResourceMigrator(QObject* parent = nullptr);
void migrateAkonadiResources(Akonadi::ServerManager::State);
void migrateKResources();
void createDefaultResources();
......
......@@ -693,7 +693,7 @@ void SingleFileResource::localFileChanged(const QString& fileName)
const QByteArray newHash = calculateHash(fileName);
// Only need to synchronise when the file was changed by another process.
// Only need to synchronize when the file was changed by another process.
if (newHash == mCurrentHash)
return;
......
......@@ -32,7 +32,7 @@ using namespace KAlarmCal;
namespace
{
void setTextEditHeight(QTextEdit*, QGroupBox*);
void setTextEditHeight(KTextEdit*, QGroupBox*);
}
......@@ -283,9 +283,9 @@ void SingleFileResourceConfigDialog::disableOkButton(const QString& statusMessag
}
/******************************************************************************
* When the dialog is displayed, set appropriate heights for QTextEdit elements,
* When the dialog is displayed, set appropriate heights for KTextEdit elements,
* and then remove empty space between widgets.
* By default, QTextEdit has a minimum height of 4 text lines, and calling
* By default, KTextEdit has a minimum height of 4 text lines, and calling
* setMinimumHeight() doesn't affect this.
*/
void SingleFileResourceConfigDialog::showEvent(QShowEvent* se)
......@@ -306,7 +306,7 @@ void SingleFileResourceConfigDialog::showEvent(QShowEvent* se)
namespace
{
void setTextEditHeight(QTextEdit* textEdit, QGroupBox* groupBox)
void setTextEditHeight(KTextEdit* textEdit, QGroupBox* groupBox)
{
const QSize size = textEdit->document()->size().toSize();
const int margin = textEdit->height() - textEdit->viewport()->height();
......
......@@ -53,7 +53,7 @@
</layout>
</item>
<item>
<widget class="QTextEdit" name="pathDescription">
<widget class="KTextEdit" name="pathDescription">
<property name="readOnly">
<bool>true</bool>
</property>
......@@ -118,7 +118,7 @@
</layout>
</item>
<item>
<widget class="QTextEdit" name="alarmTypeDescription">
<widget class="KTextEdit" name="alarmTypeDescription">
<property name="readOnly">
<bool>true</bool>
</property>
......@@ -207,7 +207,7 @@
</layout>
</item>
<item>
<widget class="QTextEdit" name="nameDescription">
<widget class="KTextEdit" name="nameDescription">
<property name="readOnly">
<bool>true</bool>
</property>
......@@ -239,7 +239,7 @@
</widget>
</item>
<item>
<widget class="QTextEdit" name="readOnlyDescription">
<widget class="KTextEdit" name="readOnlyDescription">
<property name="readOnly">
<bool>true</bool>
</property>
......@@ -274,6 +274,11 @@
<extends>QLineEdit</extends>
<header>klineedit.h</header>
</customwidget>
<customwidget>
<class>KTextEdit</class>
<extends>QTextEdit</extends>
<header>ktextedit.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
......
Markdown is supported
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