summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-08-07 15:19:33 +0200
committerAndrea Diamantini <adjam7@gmail.com>2009-08-07 15:19:33 +0200
commit3b4aa1a6cc3250978e26d5ca3bff7b7adcd1ac97 (patch)
tree2d96630ffeb8d6607592b07d87275eb8501baf81 /src
parentMerge commit 'megabigbug/query' (diff)
downloadrekonq-3b4aa1a6cc3250978e26d5ca3bff7b7adcd1ac97.tar.xz
Krazy fixes. Part 2.
- KDE classes in ui files - Ui dialog deleteLater - const in for each loop (apart from the QWebFrame one..)
Diffstat (limited to 'src')
-rw-r--r--src/networkaccessmanager.cpp4
-rw-r--r--src/password.ui4
-rw-r--r--src/proxy.ui4
-rw-r--r--src/settings_privacy.ui2
-rw-r--r--src/settings_proxy.ui9
-rw-r--r--src/webview.cpp4
6 files changed, 10 insertions, 17 deletions
diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index 3eeedd4d..c57d3fa7 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -153,7 +153,7 @@ void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthent
auth->setUser(passwordWidget.userNameLineEdit->text());
auth->setPassword(passwordWidget.passwordLineEdit->text());
}
- delete dialog;
+ dialog->deleteLater();
}
@@ -182,7 +182,7 @@ void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &prox
auth->setUser(proxyWdg.userNameLineEdit->text());
auth->setPassword(proxyWdg.passwordLineEdit->text());
}
- delete dialog;
+ dialog->deleteLater();
}
diff --git a/src/password.ui b/src/password.ui
index 458c702c..81d1e321 100644
--- a/src/password.ui
+++ b/src/password.ui
@@ -43,7 +43,7 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="QLineEdit" name="userNameLineEdit"/>
+ <widget class="KLineEdit" name="userNameLineEdit"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lblPassword">
@@ -53,7 +53,7 @@
</widget>
</item>
<item row="2" column="1">
- <widget class="QLineEdit" name="passwordLineEdit">
+ <widget class="KLineEdit" name="passwordLineEdit">
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
diff --git a/src/proxy.ui b/src/proxy.ui
index 3181b5ab..4e64f357 100644
--- a/src/proxy.ui
+++ b/src/proxy.ui
@@ -36,7 +36,7 @@
</widget>
</item>
<item row="1" column="2">
- <widget class="QLineEdit" name="userNameLineEdit"/>
+ <widget class="KLineEdit" name="userNameLineEdit"/>
</item>
<item row="2" column="0" colspan="2">
<widget class="QLabel" name="passwordLabel">
@@ -46,7 +46,7 @@
</widget>
</item>
<item row="2" column="2">
- <widget class="QLineEdit" name="passwordLineEdit">
+ <widget class="KLineEdit" name="passwordLineEdit">
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
diff --git a/src/settings_privacy.ui b/src/settings_privacy.ui
index e9e98c52..a716dc8d 100644
--- a/src/settings_privacy.ui
+++ b/src/settings_privacy.ui
@@ -31,7 +31,7 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="QComboBox" name="kcfg_expireHistory">
+ <widget class="KComboBox" name="kcfg_expireHistory">
<item>
<property name="text">
<string>After one day</string>
diff --git a/src/settings_proxy.ui b/src/settings_proxy.ui
index 90e308a2..938529b0 100644
--- a/src/settings_proxy.ui
+++ b/src/settings_proxy.ui
@@ -37,7 +37,7 @@
</widget>
</item>
<item row="1" column="1" colspan="2" >
- <widget class="QComboBox" name="kcfg_proxyType" >
+ <widget class="KComboBox" name="kcfg_proxyType" >
<item>
<property name="text" >
<string>SOCKS 5</string>
@@ -140,13 +140,6 @@
</item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
- </customwidgets>
<resources/>
<connections/>
</ui>
diff --git a/src/webview.cpp b/src/webview.cpp
index f2cfe232..dca8b6fb 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -164,7 +164,7 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
QString keywordDelimiter = cg.readEntry("KeywordDelimiter", ":");
KService::Ptr service;
KUriFilterData data;
- foreach (QString engine, favoriteEngines)
+ foreach (const QString &engine, favoriteEngines)
{
service = KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(engine));
const QString searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + keywordDelimiter;
@@ -208,7 +208,7 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
QString keywordDelimiter = cg.readEntry("KeywordDelimiter", ":");
KService::Ptr service;
KUriFilterData data;
- foreach (QString engine, favoriteEngines)
+ foreach (const QString &engine, favoriteEngines)
{
service = KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(engine));
const QString searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + keywordDelimiter;