[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdelibs/frameworks] /: KTextBrowser -> QTextBrowser
From: Anne-Marie Mahfouf <annma () kde ! org>
Date: 2013-05-15 10:23:51
Message-ID: 20130515102351.8093DA605B () git ! kde ! org
[Download RAW message or body]
Git commit 2941a5a03837be63562f81af5cd5c870077eef93 by Anne-Marie Mahfouf.
Committed on 15/05/2013 at 11:21.
Pushed by annma into branch 'frameworks'.
KTextBrowser -> QTextBrowser
M +2 -2 kdeui/dialogs/kaboutapplicationdialog.cpp
M +0 -1 kdeui/dialogs/kconfigdialogmanager.cpp
M +5 -5 kdeui/dialogs/ktip.cpp
M +2 -2 kdeui/shortcuts/kcheckaccelerators.cpp
M +3 -3 kdeui/widgets/kcharselect.cpp
M +0 -5 kdewidgets/kde.widgets
M +1 -0 kdewidgets/kdedeprecated.qrc
M +5 -0 kdewidgets/kdedeprecated.widgets
M +0 -1 kdewidgets/kdewidgets.qrc
http://commits.kde.org/kdelibs/2941a5a03837be63562f81af5cd5c870077eef93
diff --git a/kdeui/dialogs/kaboutapplicationdialog.cpp b/kdeui/dialogs/kaboutapplicationdialog.cpp
index bf0c9de..d656fa2 100644
--- a/kdeui/dialogs/kaboutapplicationdialog.cpp
+++ b/kdeui/dialogs/kaboutapplicationdialog.cpp
@@ -28,7 +28,6 @@
#include "kaboutapplicationpersonlistdelegate_p.h"
#include "kdeversion.h"
#include "kglobalsettings.h"
-#include "ktextbrowser.h"
#include "ktitlewidget.h"
#include <kaboutdata.h>
@@ -42,6 +41,7 @@
#include <QScrollBar>
#include <QStyle>
#include <QTabWidget>
+#include <QTextBrowser>
class KAboutApplicationDialog::Private
{
@@ -310,7 +310,7 @@ void KAboutApplicationDialog::Private::_k_showLicense( const QString &number )
QFontMetrics metrics(font);
const QString licenseText = aboutData.licenses().at(number.toInt()).text();
- KTextBrowser *licenseBrowser = new KTextBrowser(dialog);
+ QTextBrowser *licenseBrowser = new QTextBrowser(dialog);
licenseBrowser->setFont(font);
licenseBrowser->setLineWrapMode(QTextEdit::NoWrap);
licenseBrowser->setText(licenseText);
diff --git a/kdeui/dialogs/kconfigdialogmanager.cpp b/kdeui/dialogs/kconfigdialogmanager.cpp
index 620f0b5..405799b 100644
--- a/kdeui/dialogs/kconfigdialogmanager.cpp
+++ b/kdeui/dialogs/kconfigdialogmanager.cpp
@@ -140,7 +140,6 @@ void KConfigDialogManager::initMaps()
s_changedMap()->insert( "KLineEdit", SIGNAL(textChanged(QString)));
s_changedMap()->insert( "KPasswordEdit", SIGNAL(textChanged(QString)));
s_changedMap()->insert( "KRestrictedLine", SIGNAL(textChanged(QString)));
- s_changedMap()->insert( "KTextBrowser", SIGNAL(sourceChanged(QString)));
s_changedMap()->insert( "KTextEdit", SIGNAL(textChanged()));
s_changedMap()->insert( "KUrlRequester", SIGNAL(textChanged(QString)));
s_changedMap()->insert( "KUrlComboRequester", SIGNAL(textChanged(QString)));
diff --git a/kdeui/dialogs/ktip.cpp b/kdeui/dialogs/ktip.cpp
index 3ea2dca..011e3b3 100644
--- a/kdeui/dialogs/ktip.cpp
+++ b/kdeui/dialogs/ktip.cpp
@@ -35,6 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <QDesktopWidget>
#include <QPushButton>
#include <qstandardpaths.h>
+#include <QTextBrowser>
#include <kconfig.h>
#include <kconfiggroup.h>
@@ -43,7 +44,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <ksharedconfig.h>
#include <krandom.h>
#include <kseparator.h>
-#include <ktextbrowser.h>
#include <kstandardguiitem.h>
class KTipDatabase::Private
@@ -197,7 +197,7 @@ class KTipDialog::Private
KTipDialog *parent;
KTipDatabase *database;
QCheckBox *tipOnStart;
- KTextBrowser *tipText;
+ QTextBrowser *tipText;
static KTipDialog *mInstance;
};
@@ -254,7 +254,7 @@ KTipDialog::KTipDialog( KTipDatabase *database, QWidget *parent )
QHBoxLayout *browserLayout = new QHBoxLayout();
mainLayout->addLayout( browserLayout );
- d->tipText = new KTextBrowser( this );
+ d->tipText = new QTextBrowser( this );
d->tipText->setOpenExternalLinks( true );
@@ -404,9 +404,9 @@ bool KTipDialog::eventFilter( QObject *object, QEvent *event )
/**
* If the user presses Return or Space, we close the dialog as if the
- * default button was pressed even if the KTextBrowser has the keyboard
+ * default button was pressed even if the QTextBrowser has the keyboard
* focus. This could have the bad side-effect that the user cannot use the
- * keyboard to open urls in the KTextBrowser, so we just let it handle
+ * keyboard to open urls in the QTextBrowser, so we just let it handle
* the key event _additionally_. (Antonio)
*/
diff --git a/kdeui/shortcuts/kcheckaccelerators.cpp b/kdeui/shortcuts/kcheckaccelerators.cpp
index 612c90d..d448546 100644
--- a/kdeui/shortcuts/kcheckaccelerators.cpp
+++ b/kdeui/shortcuts/kcheckaccelerators.cpp
@@ -30,6 +30,7 @@
#include <QMenuBar>
#include <QPushButton>
#include <QTabBar>
+#include <QTextBrowser>
#include <QLabel>
#include <QComboBox>
@@ -41,7 +42,6 @@
#include <ksharedconfig.h>
#include <kdebug.h>
#include <klocalizedstring.h>
-#include <ktextbrowser.h>
#include "kacceleratormanager.h"
#include <kconfiggroup.h>
@@ -217,7 +217,7 @@ void KCheckAccelerators::createDialog(QWidget *actWin, bool automatic)
drklash->setWindowTitle( i18nc("@title:window", "Dr. Klash' Accelerator Diagnosis" ));
drklash->resize( 500, 460 );
QVBoxLayout* layout = new QVBoxLayout( drklash );
- drklash_view = new KTextBrowser( drklash );
+ drklash_view = new QTextBrowser( drklash );
layout->addWidget( drklash_view);
QCheckBox* disableAutoCheck = NULL;
if( automatic ) {
diff --git a/kdeui/widgets/kcharselect.cpp b/kdeui/widgets/kcharselect.cpp
index 2e43d0d..8023a84 100644
--- a/kdeui/widgets/kcharselect.cpp
+++ b/kdeui/widgets/kcharselect.cpp
@@ -30,12 +30,12 @@
#include <QSplitter>
#include <QPushButton>
#include <QToolButton>
+#include <QTextBrowser>
#include <kcombobox.h>
#include <kdebug.h>
#include <klocalizedstring.h>
#include <klineedit.h>
-#include <ktextbrowser.h>
#include <kfontcombobox.h>
#include <kactioncollection.h>
#include <kstandardaction.h>
@@ -92,7 +92,7 @@ public:
QComboBox *sectionCombo;
QComboBox *blockCombo;
KCharSelectTable *charTable;
- KTextBrowser *detailBrowser;
+ QTextBrowser *detailBrowser;
bool searchMode; //a search is active
bool historyEnabled;
@@ -448,7 +448,7 @@ void KCharSelect::initWidget(const Controls controls, KActionCollection *collect
connect(d->charTable, SIGNAL(showCharRequested(QChar)), this, SLOT(setCurrentChar(QChar)));
- d->detailBrowser = new KTextBrowser(this);
+ d->detailBrowser = new QTextBrowser(this);
if (DetailBrowser & controls) {
splitter->addWidget(d->detailBrowser);
} else {
diff --git a/kdewidgets/kde.widgets b/kdewidgets/kde.widgets
index 6ccdcb65..aa07c0f 100644
--- a/kdewidgets/kde.widgets
+++ b/kdewidgets/kde.widgets
@@ -263,11 +263,6 @@ ToolTip=KDE Tab Bar
WhatsThis=A QTabBar with extended features.
Group=Display (KDE)
-[KTextBrowser]
-ToolTip=Improved QTextBrowser (KDE)
-WhatsThis=An improved version of the QTextBrowser with mail or system browser invocation support
-Group=Display (KDE)
-
[KTextEdit]
ToolTip=Improved QTextEdit (KDE)
WhatsThis=An improved version of the QTextEdit with mail or system browser invocation support
diff --git a/kdewidgets/kdedeprecated.qrc b/kdewidgets/kdedeprecated.qrc
index 6152a80..699df9e 100644
--- a/kdewidgets/kdedeprecated.qrc
+++ b/kdewidgets/kdedeprecated.qrc
@@ -4,5 +4,6 @@
<file>pics/kdialog.png</file>
<file>pics/kpushbutton.png</file>
<file>pics/krestrictedline.png</file>
+<file>pics/ktextbrowser.png</file>
</qresource>
</RCC>
diff --git a/kdewidgets/kdedeprecated.widgets b/kdewidgets/kdedeprecated.widgets
index cda6929..3adc0b2 100644
--- a/kdewidgets/kdedeprecated.widgets
+++ b/kdewidgets/kdedeprecated.widgets
@@ -65,3 +65,8 @@ ToolTip=Extended List Widget (KDE)
WhatsThis=An improved version of the QListWidget that follows KDE settings
Group=Views (KDE)
+
+[KTextBrowser]
+ToolTip=Improved QTextBrowser (KDE)
+WhatsThis=An improved version of the QTextBrowser with mail or system browser invocation support
+Group=Display (KDE)
diff --git a/kdewidgets/kdewidgets.qrc b/kdewidgets/kdewidgets.qrc
index 0a741e5..06873eb 100644
--- a/kdewidgets/kdewidgets.qrc
+++ b/kdewidgets/kdewidgets.qrc
@@ -30,7 +30,6 @@
<file>pics/kpasswordedit.png</file>
<file>pics/kruler.png</file>
<file>pics/ksqueezedtextlabel.png</file>
-<file>pics/ktextbrowser.png</file>
<file>pics/ktextedit.png</file>
<file>pics/kurlcomborequester.png</file>
<file>pics/kurllabel.png</file>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic