diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-05-25 15:37:31 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-05-25 15:37:31 +0900 |
commit | 6392f5a9dfce2bf83617d49bb7f332181ec6004e (patch) | |
tree | ab69e390f7962b7e7dda1a3a64f035c61c751cf4 /lib/widgets | |
parent | aba2788b428dc53243407902e9ccbb20b97a69fd (diff) | |
download | tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.tar.gz tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.zip |
Revert "Finish renaming tdevelop components"
This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.
Diffstat (limited to 'lib/widgets')
-rw-r--r-- | lib/widgets/CMakeLists.txt | 10 | ||||
-rw-r--r-- | lib/widgets/Makefile.am | 24 | ||||
-rw-r--r-- | lib/widgets/kdevhtml_partui.rc (renamed from lib/widgets/tdevhtml_partui.rc) | 2 | ||||
-rw-r--r-- | lib/widgets/kdevhtmlpart.cpp (renamed from lib/widgets/tdevhtmlpart.cpp) | 58 | ||||
-rw-r--r-- | lib/widgets/kdevhtmlpart.h (renamed from lib/widgets/tdevhtmlpart.h) | 10 | ||||
-rw-r--r-- | lib/widgets/kdevtabwidget.cpp (renamed from lib/widgets/tdevtabwidget.cpp) | 8 | ||||
-rw-r--r-- | lib/widgets/propeditor/CMakeLists.txt | 4 | ||||
-rw-r--r-- | lib/widgets/propeditor/Makefile.am | 14 |
8 files changed, 65 insertions, 65 deletions
diff --git a/lib/widgets/CMakeLists.txt b/lib/widgets/CMakeLists.txt index 86303b6d..30e0ba3e 100644 --- a/lib/widgets/CMakeLists.txt +++ b/lib/widgets/CMakeLists.txt @@ -28,22 +28,22 @@ link_directories( install( FILES tdelistviewaction.h qcomboview.h flagboxes.h ksavealldialog.h resizablecombo.h kcomboview.h - tdevhtmlpart.h processlinemaker.h processwidget.h + kdevhtmlpart.h processlinemaker.h processwidget.h fancylistviewitem.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/widgets ) ##### other data ################################ -install( FILES tdevhtml_partui.rc DESTINATION ${DATA_INSTALL_DIR}/tdevelop ) +install( FILES kdevhtml_partui.rc DESTINATION ${DATA_INSTALL_DIR}/tdevelop ) -##### tdevwidgets (shared) ###################### +##### kdevwidgets (shared) ###################### -tde_add_library( tdevwidgets SHARED AUTOMOC +tde_add_library( kdevwidgets SHARED AUTOMOC SOURCES flagboxes.cpp qcomboview.cpp tdelistviewaction.cpp - kcomboview.cpp resizablecombo.cpp tdevhtmlpart.cpp + kcomboview.cpp resizablecombo.cpp kdevhtmlpart.cpp processlinemaker.cpp processwidget.cpp ksavealldialog.cpp fancylistviewitem.cpp VERSION 0.0.0 diff --git a/lib/widgets/Makefile.am b/lib/widgets/Makefile.am index 7181151e..69be7a11 100644 --- a/lib/widgets/Makefile.am +++ b/lib/widgets/Makefile.am @@ -2,29 +2,29 @@ INCLUDES = -I$(top_srcdir)/lib/compat -I$(top_srcdir)/lib/interfaces $(all_inclu METASOURCES = AUTO -lib_LTLIBRARIES = libtdevwidgets.la +lib_LTLIBRARIES = libkdevwidgets.la -tdevwidgetsincludedir = $(includedir)/tdevelop/widgets +kdevwidgetsincludedir = $(includedir)/tdevelop/widgets -libtdevwidgets_la_SOURCES = flagboxes.cpp qcomboview.cpp tdelistviewaction.cpp \ - kcomboview.cpp resizablecombo.cpp tdevhtmlpart.cpp processlinemaker.cpp \ +libkdevwidgets_la_SOURCES = flagboxes.cpp qcomboview.cpp tdelistviewaction.cpp \ + kcomboview.cpp resizablecombo.cpp kdevhtmlpart.cpp processlinemaker.cpp \ processwidget.cpp ksavealldialog.cpp fancylistviewitem.cpp -tdevwidgetsinclude_HEADERS = tdelistviewaction.h qcomboview.h flagboxes.h \ - ksavealldialog.h resizablecombo.h kcomboview.h tdevhtmlpart.h processlinemaker.h \ +kdevwidgetsinclude_HEADERS = tdelistviewaction.h qcomboview.h flagboxes.h \ + ksavealldialog.h resizablecombo.h kcomboview.h kdevhtmlpart.h processlinemaker.h \ processwidget.h fancylistviewitem.h SUBDIRS = propeditor -libtdevwidgets_la_LIBADD = $(top_builddir)/lib/interfaces/libtdevinterfaces.la -libtdevwidgets_la_LDFLAGS = -no-undefined $(all_libraries) +libkdevwidgets_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la +libkdevwidgets_la_LDFLAGS = -no-undefined $(all_libraries) rcdir = $(kde_datadir)/tdevelop -rc_DATA = tdevhtml_partui.rc +rc_DATA = kdevhtml_partui.rc -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevutil tdevinterfaces -DOXYGEN_PROJECTNAME = TDevelop Widgets Library -DOXYGEN_DOCDIRPREFIX = tdev +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevutil kdevinterfaces +DOXYGEN_PROJECTNAME = KDevelop Widgets Library +DOXYGEN_DOCDIRPREFIX = kdev include ../../Doxyfile.am diff --git a/lib/widgets/tdevhtml_partui.rc b/lib/widgets/kdevhtml_partui.rc index a62fa22f..5a55b7bf 100644 --- a/lib/widgets/tdevhtml_partui.rc +++ b/lib/widgets/kdevhtml_partui.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui version="3" name="TDevHTMLPart" > +<kpartgui version="3" name="KDevHTMLPart" > <MenuBar> <Menu name="file" noMerge="0"><text>&File</text> diff --git a/lib/widgets/tdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp index 6ec74651..76697cfa 100644 --- a/lib/widgets/tdevhtmlpart.cpp +++ b/lib/widgets/kdevhtmlpart.cpp @@ -14,15 +14,15 @@ #include <tdehtml_settings.h> #include <tdeconfig.h> -#include <tdevmainwindow.h> +#include <kdevmainwindow.h> -#include "tdevhtmlpart.h" +#include "kdevhtmlpart.h" -TDevHTMLPart::TDevHTMLPart() - : TDEHTMLPart(0L, 0L, 0L, "TDevHTMLPart", DefaultGUI ) +KDevHTMLPart::KDevHTMLPart() + : TDEHTMLPart(0L, 0L, 0L, "KDevHTMLPart", DefaultGUI ) { - setXMLFile(locate("data", "tdevelop/tdevhtml_partui.rc"), true); + setXMLFile(locate("data", "tdevelop/kdevhtml_partui.rc"), true); connect(browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL &,const KParts::URLArgs &)), this, TQT_SLOT(openURLRequest(const KURL &)) ); @@ -87,7 +87,7 @@ TDevHTMLPart::TDevHTMLPart() setZoomFactor(appConfig->readEntry("Zoom", "100").toInt()); } -void TDevHTMLPart::popup( const TQString & url, const TQPoint & p ) +void KDevHTMLPart::popup( const TQString & url, const TQPoint & p ) { // TDEPopupMenu popup( i18n( "Documentation Viewer" ), this->widget() ); TDEPopupMenu popup(this->widget()); @@ -143,11 +143,11 @@ void TDevHTMLPart::popup( const TQString & url, const TQPoint & p ) kdDebug() << "processing relative url: " << url << endl; if (url.startsWith("#")) { - kurl = KURL(TDevHTMLPart::url()); + kurl = KURL(KDevHTMLPart::url()); kurl.setRef(url.mid(1)); } else - kurl = KURL(TDevHTMLPart::url().upURL().url(true)+url); + kurl = KURL(KDevHTMLPart::url().upURL().url(true)+url); } else kurl = KURL(url); @@ -157,13 +157,13 @@ void TDevHTMLPart::popup( const TQString & url, const TQPoint & p ) } } -void TDevHTMLPart::setContext(const TQString &context) +void KDevHTMLPart::setContext(const TQString &context) { m_context = context; } -TQString TDevHTMLPart::context() const +TQString KDevHTMLPart::context() const { return m_context; } @@ -250,7 +250,7 @@ done: #undef I #undef X -TQString TDevHTMLPart::resolveEnvVarsInURL(const TQString& url) +TQString KDevHTMLPart::resolveEnvVarsInURL(const TQString& url) { // check for environment variables and make necessary translations TQString path = url; @@ -318,7 +318,7 @@ TQString TDevHTMLPart::resolveEnvVarsInURL(const TQString& url) return path; } -bool TDevHTMLPart::openURL(const KURL &url) +bool KDevHTMLPart::openURL(const KURL &url) { TQString path = resolveEnvVarsInURL(url.url()); KURL newUrl(path); @@ -339,47 +339,47 @@ bool TDevHTMLPart::openURL(const KURL &url) return retval; } -void TDevHTMLPart::openURLRequest(const KURL &url) +void KDevHTMLPart::openURLRequest(const KURL &url) { openURL( url ); } -void TDevHTMLPart::slotReload( ) +void KDevHTMLPart::slotReload( ) { openURL( url() ); } -void TDevHTMLPart::slotStop( ) +void KDevHTMLPart::slotStop( ) { closeURL(); } -void TDevHTMLPart::slotStarted( TDEIO::Job * ) +void KDevHTMLPart::slotStarted( TDEIO::Job * ) { stopAction->setEnabled(true); } -void TDevHTMLPart::slotCompleted( ) +void KDevHTMLPart::slotCompleted( ) { stopAction->setEnabled(false); } -void TDevHTMLPart::slotCancelled( const TQString & /*errMsg*/ ) +void KDevHTMLPart::slotCancelled( const TQString & /*errMsg*/ ) { stopAction->setEnabled(false); } -/*void TDevHTMLPart::slotDuplicate( ) +/*void KDevHTMLPart::slotDuplicate( ) { PartController::getInstance()->showDocument(url(), true); }*/ -void TDevHTMLPart::slotPrint( ) +void KDevHTMLPart::slotPrint( ) { view()->print(); } -void TDevHTMLPart::slotBack() +void KDevHTMLPart::slotBack() { if ( m_Current != m_history.begin() ) { @@ -390,7 +390,7 @@ void TDevHTMLPart::slotBack() } } -void TDevHTMLPart::slotForward() +void KDevHTMLPart::slotForward() { if ( m_Current != m_history.fromLast() ) { @@ -401,7 +401,7 @@ void TDevHTMLPart::slotForward() } } -void TDevHTMLPart::slotBackAboutToShow() +void KDevHTMLPart::slotBackAboutToShow() { TDEPopupMenu *popup = m_backAction->popupMenu(); popup->clear(); @@ -426,7 +426,7 @@ void TDevHTMLPart::slotBackAboutToShow() } } -void TDevHTMLPart::slotForwardAboutToShow() +void KDevHTMLPart::slotForwardAboutToShow() { TDEPopupMenu *popup = m_forwardAction->popupMenu(); popup->clear(); @@ -451,7 +451,7 @@ void TDevHTMLPart::slotForwardAboutToShow() } } -void TDevHTMLPart::slotPopupActivated( int id ) +void KDevHTMLPart::slotPopupActivated( int id ) { kdDebug(9000) << "id: " << id << endl; @@ -471,7 +471,7 @@ void TDevHTMLPart::slotPopupActivated( int id ) } } -void TDevHTMLPart::addHistoryEntry() +void KDevHTMLPart::addHistoryEntry() { TQValueList<DocumentationHistoryEntry>::Iterator it = m_Current; @@ -491,7 +491,7 @@ void TDevHTMLPart::addHistoryEntry() } } -void TDevHTMLPart::slotCopy( ) +void KDevHTMLPart::slotCopy( ) { TQString text = selectedText(); text.replace( TQChar( 0xa0 ), ' ' ); @@ -501,7 +501,7 @@ void TDevHTMLPart::slotCopy( ) connect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) ); } -void TDevHTMLPart::slotSelectionChanged( ) +void KDevHTMLPart::slotSelectionChanged( ) { if (selectedText().isEmpty()) copyAction->setEnabled(false); @@ -509,4 +509,4 @@ void TDevHTMLPart::slotSelectionChanged( ) copyAction->setEnabled(true); } -#include "tdevhtmlpart.moc" +#include "kdevhtmlpart.moc" diff --git a/lib/widgets/tdevhtmlpart.h b/lib/widgets/kdevhtmlpart.h index e822488b..6c8f7dc3 100644 --- a/lib/widgets/tdevhtmlpart.h +++ b/lib/widgets/kdevhtmlpart.h @@ -1,5 +1,5 @@ -#ifndef __TDEVHTMLPART_H__ -#define __TDEVHTMLPART_H__ +#ifndef __KDEVHTMLPART_H__ +#define __KDEVHTMLPART_H__ #include <stdlib.h> @@ -8,7 +8,7 @@ #include <tdehtml_part.h> /** -@file tdevhtmlpart.h +@file kdevhtmlpart.h Customized TDEHTML part for KDevelop. */ @@ -41,7 +41,7 @@ Represents customized BrowserViewGUI mode of TDEHTMLPart. Provides also actions . It has it's own popup menu and font/zoom settings. */ -class TDevHTMLPart : public TDEHTMLPart +class KDevHTMLPart : public TDEHTMLPart { Q_OBJECT @@ -50,7 +50,7 @@ public: enum Options { CanDuplicate=1, CanOpenInNewWindow=2 }; - TDevHTMLPart(); + KDevHTMLPart(); void setContext(const TQString &context); TQString context() const; diff --git a/lib/widgets/tdevtabwidget.cpp b/lib/widgets/kdevtabwidget.cpp index adfd4566..33c9f733 100644 --- a/lib/widgets/tdevtabwidget.cpp +++ b/lib/widgets/kdevtabwidget.cpp @@ -16,9 +16,9 @@ #include <kicontheme.h> #include <kiconloader.h> -#include "tdevtabwidget.h" +#include "kdevtabwidget.h" -TDevTabWidget::TDevTabWidget(TQWidget *parent, const char *name) : TQTabWidget(parent,name) +KDevTabWidget::KDevTabWidget(TQWidget *parent, const char *name) : TQTabWidget(parent,name) { m_pTabBar = new KTabBar(this, "tabbar"); setTabBar(m_pTabBar); @@ -55,7 +55,7 @@ void KTabBar::mousePressEvent(TQMouseEvent *e) TQTab *tab = selectTab(e->pos() ); if( tab == 0L ) return; - m_pPage = ((TDevTabWidget*)parent())->page(indexOf(tab->identifier() ) ); + m_pPage = ((KDevTabWidget*)parent())->page(indexOf(tab->identifier() ) ); if(m_pPage == 0L) return; m_pPopupMenu->exec(mapToGlobal(e->pos())); @@ -63,4 +63,4 @@ void KTabBar::mousePressEvent(TQMouseEvent *e) TQTabBar::mousePressEvent(e); } -#include "tdevtabwidget.moc" +#include "kdevtabwidget.moc" diff --git a/lib/widgets/propeditor/CMakeLists.txt b/lib/widgets/propeditor/CMakeLists.txt index 1cffb908..2620aaa0 100644 --- a/lib/widgets/propeditor/CMakeLists.txt +++ b/lib/widgets/propeditor/CMakeLists.txt @@ -38,9 +38,9 @@ install( FILES DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/propeditor ) -##### tdevpropertyeditor (shared) ############### +##### kdevpropertyeditor (shared) ############### -tde_add_library( tdevpropertyeditor SHARED AUTOMOC +tde_add_library( kdevpropertyeditor SHARED AUTOMOC SOURCES childproperty.cpp pcombobox.cpp pdummywidget.cpp ppointedit.cpp propertymachinefactory.cpp diff --git a/lib/widgets/propeditor/Makefile.am b/lib/widgets/propeditor/Makefile.am index a01eb4d3..e07d5c69 100644 --- a/lib/widgets/propeditor/Makefile.am +++ b/lib/widgets/propeditor/Makefile.am @@ -1,18 +1,18 @@ INCLUDES = -I$(top_srcdir)/lib/compat $(all_includes) METASOURCES = AUTO -lib_LTLIBRARIES = libtdevpropertyeditor.la -libtdevpropertyeditor_la_LIBADD = $(LIB_TDEIO) -libtdevpropertyeditor_la_LDFLAGS = -no-undefined $(all_libraries) -libtdevpropertyeditor_la_SOURCES = childproperty.cpp pcombobox.cpp pdummywidget.cpp ppointedit.cpp propertymachinefactory.cpp pstringlistedit.cpp\ +lib_LTLIBRARIES = libkdevpropertyeditor.la +libkdevpropertyeditor_la_LIBADD = $(LIB_TDEIO) +libkdevpropertyeditor_la_LDFLAGS = -no-undefined $(all_libraries) +libkdevpropertyeditor_la_SOURCES = childproperty.cpp pcombobox.cpp pdummywidget.cpp ppointedit.cpp propertymachinefactory.cpp pstringlistedit.cpp\ multiproperty.cpp pcursoredit.cpp pfontbutton.cpp prectedit.cpp propertywidget.cpp psymbolcombo.cpp\ pcheckbox.cpp pdateedit.cpp pfontcombo.cpp property.cpp psizeedit.cpp purledit.cpp\ pcolorbutton.cpp pdatetimeedit.cpp plineedit.cpp propertyeditor.cpp psizepolicyedit.cpp pyesnobutton.cpp\ pcolorcombo.cpp pdoublenuminput.cpp ppixmapedit.cpp propertylist.cpp pspinbox.cpp propertywidgetproxy.cpp plinestyleedit.cpp qeditlistbox.cpp -tdevpropeditorincludedir = $(includedir)/tdevelop/propeditor -tdevpropeditorinclude_HEADERS = childproperty.h pcombobox.h pdummywidget.h ppointedit.h propertymachinefactory.h pcursoredit.h pfontbutton.h prectedit.h propertywidget.h pdateedit.h pfontcombo.h property.h psizeedit.h pdatetimeedit.h plineedit.h propertyeditor.h psizepolicyedit.h pdoublenuminput.h ppixmapedit.h propertylist.h pspinbox.h propertywidgetproxy.h multiproperty.h pyesnobutton.h purledit.h psymbolcombo.h pstringlistedit.h pcolorcombo.h pcolorbutton.h pcheckbox.h plinestyleedit.h +kdevpropeditorincludedir = $(includedir)/tdevelop/propeditor +kdevpropeditorinclude_HEADERS = childproperty.h pcombobox.h pdummywidget.h ppointedit.h propertymachinefactory.h pcursoredit.h pfontbutton.h prectedit.h propertywidget.h pdateedit.h pfontcombo.h property.h psizeedit.h pdatetimeedit.h plineedit.h propertyeditor.h psizepolicyedit.h pdoublenuminput.h ppixmapedit.h propertylist.h pspinbox.h propertywidgetproxy.h multiproperty.h pyesnobutton.h purledit.h psymbolcombo.h pstringlistedit.h pcolorcombo.h pcolorbutton.h pcheckbox.h plinestyleedit.h DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils -DOXYGEN_PROJECTNAME = TDevelop Property Editing Library +DOXYGEN_PROJECTNAME = KDevelop Property Editing Library include ../../../Doxyfile.am |