From 73694c4e0d2656b9d8ed90f6ea8424a877af78db Mon Sep 17 00:00:00 2001 From: Elvio Basello Date: Thu, 24 Sep 2009 15:37:12 +0000 Subject: removed useless KviTalTextEdit class git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3520 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/kvilib/CMakeLists.txt | 2 -- src/kvilib/config/kvi_sourcesdate.h | 4 ++-- src/kvilib/tal/kvi_tal_textedit.cpp | 31 ------------------------ src/kvilib/tal/kvi_tal_textedit.h | 44 ----------------------------------- src/kvirc/ui/kvi_htmldialog.cpp | 1 - src/modules/about/aboutdialog.cpp | 8 +++---- src/modules/addon/packaddondialog.cpp | 4 ++-- src/modules/addon/packaddondialog.h | 12 +++++----- src/modules/editor/scripteditor.cpp | 2 +- src/modules/editor/scripteditor.h | 3 +-- src/modules/setup/setupwizard.cpp | 4 ++-- src/modules/theme/packthemedialog.cpp | 6 ++--- src/modules/theme/packthemedialog.h | 22 +++++++++--------- src/modules/theme/savethemedialog.cpp | 4 ++-- src/modules/theme/savethemedialog.h | 22 ++++++++---------- 15 files changed, 44 insertions(+), 125 deletions(-) delete mode 100644 src/kvilib/tal/kvi_tal_textedit.cpp delete mode 100644 src/kvilib/tal/kvi_tal_textedit.h (limited to 'src') diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt index c8ef96ffd..c1332b8c8 100644 --- a/src/kvilib/CMakeLists.txt +++ b/src/kvilib/CMakeLists.txt @@ -36,7 +36,6 @@ SET(kvilib_MOC_HDRS tal/kvi_tal_splitter.h tal/kvi_tal_tabdialog.h tal/kvi_tal_tablewidget.h - tal/kvi_tal_textedit.h tal/kvi_tal_toolbar.h tal/kvi_tal_tooltip.h tal/kvi_tal_vbox.h @@ -114,7 +113,6 @@ SET(kvilib_SRCS tal/kvi_tal_scrollview.cpp tal/kvi_tal_tabdialog.cpp tal/kvi_tal_tablewidget.cpp - tal/kvi_tal_textedit.cpp tal/kvi_tal_toolbar.cpp tal/kvi_tal_tooltip.cpp tal/kvi_tal_vbox.cpp diff --git a/src/kvilib/config/kvi_sourcesdate.h b/src/kvilib/config/kvi_sourcesdate.h index 22973e0b4..4a75c57ba 100644 --- a/src/kvilib/config/kvi_sourcesdate.h +++ b/src/kvilib/config/kvi_sourcesdate.h @@ -36,8 +36,8 @@ * \def KVI_SOURCES_DATE Defines the sources date * \def KVI_SOURCES_DATE_NUMERIC Defines the sources date */ -#define KVI_SOURCES_DATE "20090907" -#define KVI_SOURCES_DATE_NUMERIC 0x20090907 +#define KVI_SOURCES_DATE "20090924" +#define KVI_SOURCES_DATE_NUMERIC 0x20090924 /** * \brief This is the date of the sources before that we should force a setup diff --git a/src/kvilib/tal/kvi_tal_textedit.cpp b/src/kvilib/tal/kvi_tal_textedit.cpp deleted file mode 100644 index fb72284e0..000000000 --- a/src/kvilib/tal/kvi_tal_textedit.cpp +++ /dev/null @@ -1,31 +0,0 @@ -//============================================================================= -// -// File : kvi_tal_textedit.cpp -// Creation date : Tue Feb 06 2007 14:35:08 by Szymon Stefanek -// -// This file is part of the KVirc irc client distribution -// Copyright (C) 2007-2008 Szymon Stefanek (pragma at kvirc dot net) -// -// This program is FREE software. You can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your opinion) any later version. -// -// This program is distributed in the HOPE that it will be USEFUL, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -// See the GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, write to the Free Software Foundation, -// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -// -//============================================================================= - -#include "kvi_tal_textedit.h" - - -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES - #include "kvi_tal_textedit.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES - diff --git a/src/kvilib/tal/kvi_tal_textedit.h b/src/kvilib/tal/kvi_tal_textedit.h deleted file mode 100644 index a1d280f6d..000000000 --- a/src/kvilib/tal/kvi_tal_textedit.h +++ /dev/null @@ -1,44 +0,0 @@ -#ifndef _KVI_TAL_TEXTEDIT_H_ -#define _KVI_TAL_TEXTEDIT_H_ - -//============================================================================= -// -// File : kvi_tal_textedit.h -// Creation date : Tue Feb 06 2007 14:35:08 by Szymon Stefanek -// -// This file is part of the KVirc irc client distribution -// Copyright (C) 2007-2008 Szymon Stefanek (pragma at kvirc dot net) -// -// This program is FREE software. You can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your opinion) any later version. -// -// This program is distributed in the HOPE that it will be USEFUL, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -// See the GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, write to the Free Software Foundation, -// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -// -//============================================================================= - -#include "kvi_settings.h" - -#include - -class KVILIB_API KviTalTextEdit : public QTextEdit -{ - Q_OBJECT -public: - KviTalTextEdit(QWidget * pParent = 0,const char * name = 0) - : QTextEdit(pParent) - { - setObjectName(name); - }; - ~KviTalTextEdit() {}; -}; - -#endif // _KVI_TAL_TEXTEDIT_H_ diff --git a/src/kvirc/ui/kvi_htmldialog.cpp b/src/kvirc/ui/kvi_htmldialog.cpp index f42715175..5dc7696dc 100644 --- a/src/kvirc/ui/kvi_htmldialog.cpp +++ b/src/kvirc/ui/kvi_htmldialog.cpp @@ -25,7 +25,6 @@ #include "kvi_htmldialog.h" #include "kvi_locale.h" -#include "kvi_tal_textedit.h" #include #include diff --git a/src/modules/about/aboutdialog.cpp b/src/modules/about/aboutdialog.cpp index 2a3b1c78d..b21c15615 100644 --- a/src/modules/about/aboutdialog.cpp +++ b/src/modules/about/aboutdialog.cpp @@ -32,8 +32,8 @@ #include "kvi_sourcesdate.h" #include "kvi_buildinfo.h" #include "kvi_osinfo.h" -#include "kvi_tal_textedit.h" +#include #include #include #include @@ -112,7 +112,7 @@ KviAboutDialog::KviAboutDialog() w = new QWidget(this); g = new QGridLayout(w); - KviTalTextEdit * v = new KviTalTextEdit(w); + QTextEdit * v = new QTextEdit(w); v->setReadOnly(true); g->addWidget(v,0,0); @@ -186,7 +186,7 @@ KviAboutDialog::KviAboutDialog() w = new QWidget(this); g = new QGridLayout(w); - v = new KviTalTextEdit(w); + v = new QTextEdit(w); v->setReadOnly(true); g->addWidget(v,0,0); @@ -199,7 +199,7 @@ KviAboutDialog::KviAboutDialog() w = new QWidget(this); g = new QGridLayout(w); - v = new KviTalTextEdit(w); + v = new QTextEdit(w); v->setReadOnly(true); v->setWordWrapMode(QTextOption::NoWrap); g->addWidget(v,0,0); diff --git a/src/modules/addon/packaddondialog.cpp b/src/modules/addon/packaddondialog.cpp index 4376e91e3..bbbbfc028 100644 --- a/src/modules/addon/packaddondialog.cpp +++ b/src/modules/addon/packaddondialog.cpp @@ -39,8 +39,8 @@ #include "kvi_selectors.h" #include "kvi_miscutils.h" #include "kvi_sourcesdate.h" -#include "kvi_tal_textedit.h" +#include #include #include #include @@ -512,7 +512,7 @@ KviPackAddonInfoPackageWidget::KviPackAddonInfoPackageWidget(KviPackAddonDialog pLabel->setText(__tr2qs_ctx("Package &Description:","addon")); pLayout->addWidget(pLabel,3,0); - m_pPackageDescriptionEdit = new KviTalTextEdit(this); + m_pPackageDescriptionEdit = new QTextEdit(this); m_pPackageDescriptionEdit->setBackgroundRole(QPalette::Window); m_pPackageDescriptionEdit->setText(__tr2qs_ctx("Put a package description here...","addon")); pLabel->setBuddy(m_pPackageDescriptionEdit); diff --git a/src/modules/addon/packaddondialog.h b/src/modules/addon/packaddondialog.h index 8ae66e2b2..c4943e757 100644 --- a/src/modules/addon/packaddondialog.h +++ b/src/modules/addon/packaddondialog.h @@ -36,11 +36,11 @@ #include "kvi_settings.h" #include "kvi_pointerlist.h" #include "kvi_selectors.h" -#include "kvi_tal_textedit.h" #include #include +class QTextEdit; class QLineEdit; class QLabel; @@ -123,11 +123,11 @@ public: */ ~KviPackAddonInfoPackageWidget(); protected: - QLineEdit * m_pPackageAuthorEdit; - QLineEdit * m_pPackageNameEdit; - QLineEdit * m_pPackageVersionEdit; - KviTalTextEdit * m_pPackageDescriptionEdit; - QLineEdit * m_pPackageMinVersionEdit; + QLineEdit * m_pPackageAuthorEdit; + QLineEdit * m_pPackageNameEdit; + QLineEdit * m_pPackageVersionEdit; + QTextEdit * m_pPackageDescriptionEdit; + QLineEdit * m_pPackageMinVersionEdit; }; /** diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp index 349eeff03..56f1849bf 100644 --- a/src/modules/editor/scripteditor.cpp +++ b/src/modules/editor/scripteditor.cpp @@ -940,7 +940,7 @@ void KviScriptEditorImplementation::loadFromFile() { m_pEditor->setPlainText(szBuffer); setCursorPosition(0); - //m_pEditor->moveCursor(KviTalTextEdit::MoveEnd,false); + //m_pEditor->moveCursor(QTextEdit::MoveEnd,false); //updateRowColLabel(); } else { QString szTmp; diff --git a/src/modules/editor/scripteditor.h b/src/modules/editor/scripteditor.h index 7a66f1074..a95def827 100644 --- a/src/modules/editor/scripteditor.h +++ b/src/modules/editor/scripteditor.h @@ -28,7 +28,6 @@ #include "kvi_scripteditor.h" #include "kvi_pointerlist.h" #include "kvi_selectors.h" -#include "kvi_tal_textedit.h" #include "kvi_tal_popupmenu.h" #include @@ -55,7 +54,7 @@ public: public: QString m_szFind; protected: - KviScriptEditorSyntaxHighlighter *m_pSyntaxHighlighter; + KviScriptEditorSyntaxHighlighter * m_pSyntaxHighlighter; QCompleter * m_pCompleter; QStringList * m_pListModulesNames; QStringList * m_pListCompletition; diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp index ec84bd527..2439e8a2e 100644 --- a/src/modules/setup/setupwizard.cpp +++ b/src/modules/setup/setupwizard.cpp @@ -36,9 +36,9 @@ bool g_bFoundMirc; #include "kvi_env.h" #include "kvi_options.h" #include "kvi_config.h" -#include "kvi_tal_textedit.h" #include "kvi_tal_hbox.h" +#include #include #include #include @@ -190,7 +190,7 @@ KviSetupWizard::KviSetupWizard() "

" \ "

The \"legalese\" version of the license is shown in the box below.

")); - KviTalTextEdit * ed = new KviTalTextEdit(m_pLicense->m_pVBox); + QTextEdit * ed = new QTextEdit(m_pLicense->m_pVBox); ed->setReadOnly(true); ed->setWordWrapMode(QTextOption::NoWrap); QString szLicense; diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/packthemedialog.cpp index d28384296..e9cbd1ff6 100644 --- a/src/modules/theme/packthemedialog.cpp +++ b/src/modules/theme/packthemedialog.cpp @@ -39,8 +39,8 @@ #include "kvi_selectors.h" #include "kvi_miscutils.h" #include "kvi_sourcesdate.h" -#include "kvi_tal_textedit.h" +#include #include #include #include @@ -185,7 +185,7 @@ KviPackThemeDialog::KviPackThemeDialog(QWidget * pParent,KviPointerListsetBackgroundRole(QPalette::Window); pTextEdit->setReadOnly(true); QTextDocument *doc=new QTextDocument(pTextEdit); @@ -235,7 +235,7 @@ KviPackThemeDialog::KviPackThemeDialog(QWidget * pParent,KviPointerListsetText(__tr2qs_ctx("Description:","theme")); pLayout->addWidget(pLabel,3,0); - m_pPackageDescriptionEdit = new KviTalTextEdit(pPage); + m_pPackageDescriptionEdit = new QTextEdit(pPage); m_pPackageDescriptionEdit->setText(szPackageDescription); pLayout->addWidget(m_pPackageDescriptionEdit,3,1); diff --git a/src/modules/theme/packthemedialog.h b/src/modules/theme/packthemedialog.h index 3be50f4db..a794bcf39 100644 --- a/src/modules/theme/packthemedialog.h +++ b/src/modules/theme/packthemedialog.h @@ -33,7 +33,7 @@ class QLineEdit; class QLabel; -class KviTalTextEdit; +class QTextEdit; class KviFileSelector; @@ -44,17 +44,17 @@ public: KviPackThemeDialog(QWidget * pParent,KviPointerList * pThemeInfoList); virtual ~KviPackThemeDialog(); protected: - QString m_szImagePath; - KviFileSelector * m_pImageSelector; - QString m_szPackagePath; - KviFileSelector * m_pPathSelector; - QLabel * m_pImageLabel; + QString m_szImagePath; + KviFileSelector * m_pImageSelector; + QString m_szPackagePath; + KviFileSelector * m_pPathSelector; + QLabel * m_pImageLabel; KviPointerList * m_pThemeInfoList; - QLineEdit * m_pPackageNameEdit; - KviTalTextEdit * m_pPackageDescriptionEdit; - QLineEdit * m_pPackageVersionEdit; - QLineEdit * m_pPackagerNameEdit; - QWidget * m_pImageSelectionPage; + QLineEdit * m_pPackageNameEdit; + QTextEdit * m_pPackageDescriptionEdit; + QLineEdit * m_pPackageVersionEdit; + QLineEdit * m_pPackagerNameEdit; + QWidget * m_pImageSelectionPage; protected: virtual void accept(); bool packTheme(); diff --git a/src/modules/theme/savethemedialog.cpp b/src/modules/theme/savethemedialog.cpp index cea3933b7..efc0064da 100644 --- a/src/modules/theme/savethemedialog.cpp +++ b/src/modules/theme/savethemedialog.cpp @@ -39,8 +39,8 @@ #include "kvi_selectors.h" #include "kvi_miscutils.h" #include "kvi_sourcesdate.h" -#include "kvi_tal_textedit.h" +#include #include #include #include @@ -119,7 +119,7 @@ KviSaveThemeDialog::KviSaveThemeDialog(QWidget * pParent) pLabel->setText(__tr2qs_ctx("Description:","theme")); pLayout->addWidget(pLabel,3,0); - m_pThemeDescriptionEdit = new KviTalTextEdit(pPage); + m_pThemeDescriptionEdit = new QTextEdit(pPage); //m_pThemeDescriptionEdit->setText(szThemeDescription); pLayout->addWidget(m_pThemeDescriptionEdit,3,1); diff --git a/src/modules/theme/savethemedialog.h b/src/modules/theme/savethemedialog.h index 80a503694..99b9529d5 100644 --- a/src/modules/theme/savethemedialog.h +++ b/src/modules/theme/savethemedialog.h @@ -34,7 +34,7 @@ class QLineEdit; class QPushButton; class QLabel; -class KviTalTextEdit; +class QTextEdit; class KviFileSelector; @@ -45,24 +45,22 @@ public: KviSaveThemeDialog(QWidget * pParent); virtual ~KviSaveThemeDialog(); protected: - QString m_szScreenshotPath; + QString m_szScreenshotPath; KviFileSelector * m_pImageSelector; - QLabel * m_pImageLabel; - QLineEdit * m_pThemeNameEdit; - KviTalTextEdit * m_pThemeDescriptionEdit; - QLineEdit * m_pThemeVersionEdit; - QLineEdit * m_pAuthorNameEdit; - QWidget * m_pImageSelectionPage; - QPushButton * m_pOkButton; + QLabel * m_pImageLabel; + QLineEdit * m_pThemeNameEdit; + QTextEdit * m_pThemeDescriptionEdit; + QLineEdit * m_pThemeVersionEdit; + QLineEdit * m_pAuthorNameEdit; + QWidget * m_pImageSelectionPage; + QPushButton * m_pOkButton; protected: virtual void accept(); bool saveTheme(); protected slots: void makeScreenshot(); - void imageSelectionChanged(const QString &szImagePath); + void imageSelectionChanged(const QString & szImagePath); //void themeNameChanged(const QString &txt); }; - - #endif //!_SAVETHEMEDIALOG_H_ -- cgit v1.3.1-10-gc9f91