summaryrefslogtreecommitdiffstats
path: root/lib/util
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2014-05-25 15:37:31 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2014-05-25 15:37:31 +0900
commit6392f5a9dfce2bf83617d49bb7f332181ec6004e (patch)
treeab69e390f7962b7e7dda1a3a64f035c61c751cf4 /lib/util
parentaba2788b428dc53243407902e9ccbb20b97a69fd (diff)
downloadtdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.tar.gz
tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.zip
Revert "Finish renaming tdevelop components"
This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.
Diffstat (limited to 'lib/util')
-rw-r--r--lib/util/CMakeLists.txt8
-rw-r--r--lib/util/Makefile.am18
-rw-r--r--lib/util/configwidgetproxy.cpp4
-rw-r--r--lib/util/configwidgetproxy.h8
-rw-r--r--lib/util/filetemplate.cpp18
-rw-r--r--lib/util/filetemplate.h12
-rw-r--r--lib/util/kdeveditorutil.cpp (renamed from lib/util/tdeveditorutil.cpp)10
-rw-r--r--lib/util/kdeveditorutil.h (renamed from lib/util/tdeveditorutil.h)8
-rw-r--r--lib/util/kdevjobtimer.cpp (renamed from lib/util/tdevjobtimer.cpp)14
-rw-r--r--lib/util/kdevjobtimer.h (renamed from lib/util/tdevjobtimer.h)10
-rw-r--r--lib/util/kdevshellwidget.cpp (renamed from lib/util/tdevshellwidget.cpp)24
-rw-r--r--lib/util/kdevshellwidget.h (renamed from lib/util/tdevshellwidget.h)10
12 files changed, 72 insertions, 72 deletions
diff --git a/lib/util/CMakeLists.txt b/lib/util/CMakeLists.txt
index 0114b5ae..1eb17f35 100644
--- a/lib/util/CMakeLists.txt
+++ b/lib/util/CMakeLists.txt
@@ -26,13 +26,13 @@ install( FILES
DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/util )
-##### tdevutil (static) #########################
+##### kdevutil (static) #########################
-tde_add_library( tdevutil STATIC_PIC AUTOMOC
+tde_add_library( kdevutil STATIC_PIC AUTOMOC
SOURCES
blockingkprocess.cpp configwidgetproxy.cpp
domutil.cpp execcommand.cpp filetemplate.cpp
- tdeveditorutil.cpp tdevjobtimer.cpp
- tdevshellwidget.cpp tdescriptactionmanager.cpp
+ kdeveditorutil.cpp kdevjobtimer.cpp
+ kdevshellwidget.cpp tdescriptactionmanager.cpp
rurl.cpp settings.cpp urlutil.cpp
)
diff --git a/lib/util/Makefile.am b/lib/util/Makefile.am
index 52ededb0..8bf28091 100644
--- a/lib/util/Makefile.am
+++ b/lib/util/Makefile.am
@@ -1,10 +1,10 @@
INCLUDES = -I$(top_srcdir)/lib/compat -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/sourceinfo $(all_includes)
-noinst_LTLIBRARIES = libtdevutil.la
+noinst_LTLIBRARIES = libkdevutil.la
-libtdevutil_la_SOURCES = blockingkprocess.cpp configwidgetproxy.cpp domutil.cpp \
- execcommand.cpp filetemplate.cpp tdeveditorutil.cpp tdevjobtimer.cpp \
- tdevshellwidget.cpp tdescriptactionmanager.cpp rurl.cpp settings.cpp urlutil.cpp
+libkdevutil_la_SOURCES = blockingkprocess.cpp configwidgetproxy.cpp domutil.cpp \
+ execcommand.cpp filetemplate.cpp kdeveditorutil.cpp kdevjobtimer.cpp \
+ kdevshellwidget.cpp tdescriptactionmanager.cpp rurl.cpp settings.cpp urlutil.cpp
METASOURCES = AUTO
@@ -12,10 +12,10 @@ tdevelopincludedir = $(includedir)/tdevelop/util
tdevelopinclude_HEADERS = domutil.h execcommand.h filetemplate.h urlutil.h \
configwidgetproxy.h rurl.h tdescriptactionmanager.h
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevextensions tdevinterfaces
-DOXYGEN_PROJECTNAME = TDevelop Utility Library
-DOXYGEN_DOCDIRPREFIX = tdev
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevextensions kdevinterfaces
+DOXYGEN_PROJECTNAME = KDevelop Utility Library
+DOXYGEN_DOCDIRPREFIX = kdev
include ../../Doxyfile.am
-noinst_HEADERS = blockingkprocess.h tdeveditorutil.h tdevjobtimer.h \
- tdevshellwidget.h settings.h
+noinst_HEADERS = blockingkprocess.h kdeveditorutil.h kdevjobtimer.h \
+ kdevshellwidget.h settings.h
diff --git a/lib/util/configwidgetproxy.cpp b/lib/util/configwidgetproxy.cpp
index c2251158..bea1c79a 100644
--- a/lib/util/configwidgetproxy.cpp
+++ b/lib/util/configwidgetproxy.cpp
@@ -26,13 +26,13 @@
#include <kdialogbase.h>
#include <kiconloader.h>
-#include <tdevcore.h>
+#include <kdevcore.h>
#include "configwidgetproxy.h"
-ConfigWidgetProxy::ConfigWidgetProxy( TDevCore * core )
+ConfigWidgetProxy::ConfigWidgetProxy( KDevCore * core )
{
connect( core, TQT_SIGNAL(configWidget(KDialogBase*)), this, TQT_SLOT(slotConfigWidget( KDialogBase*)) );
connect( core, TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(slotProjectConfigWidget( KDialogBase*)) );
diff --git a/lib/util/configwidgetproxy.h b/lib/util/configwidgetproxy.h
index f1ced178..7881f830 100644
--- a/lib/util/configwidgetproxy.h
+++ b/lib/util/configwidgetproxy.h
@@ -24,7 +24,7 @@
#include <tqstring.h>
#include <tqmap.h>
-class TDevCore;
+class KDevCore;
class KDialogBase;
/**
@@ -65,8 +65,8 @@ void MyPart::insertConfigWidget( TQObject const * dlg, TQWidget * page, unsigned
}
@endcode
-Note that this replaces the functionality of typical TDevCore::configWidget() and
-TDevCore::projectConfigWidget() slots.
+Note that this replaces the functionality of typical KDevCore::configWidget() and
+KDevCore::projectConfigWidget() slots.
*/
class ConfigWidgetProxy : public TQObject
{
@@ -76,7 +76,7 @@ Q_OBJECT
public:
/**Constructor.
@param core An instance of KDevelop Core.*/
- ConfigWidgetProxy( TDevCore * core );
+ ConfigWidgetProxy( KDevCore * core );
virtual ~ConfigWidgetProxy();
/**
diff --git a/lib/util/filetemplate.cpp b/lib/util/filetemplate.cpp
index 4d0facdf..c2454580 100644
--- a/lib/util/filetemplate.cpp
+++ b/lib/util/filetemplate.cpp
@@ -27,12 +27,12 @@
#include <kstandarddirs.h>
-#include "tdevplugin.h"
-#include "tdevproject.h"
+#include "kdevplugin.h"
+#include "kdevproject.h"
#include "domutil.h"
-bool FileTemplate::exists(TDevPlugin *part, const TQString &name, Policy p)
+bool FileTemplate::exists(KDevPlugin *part, const TQString &name, Policy p)
{
//TQString fileName = (p == Default) ?
// (part->project()->projectDirectory() + "/templates/" + name) : name;
@@ -40,17 +40,17 @@ bool FileTemplate::exists(TDevPlugin *part, const TQString &name, Policy p)
return TQFile::exists( fullPathForName(part,name,p) );
}
-TQString FileTemplate::read(TDevPlugin *part, const TQString &name, Policy p)
+TQString FileTemplate::read(KDevPlugin *part, const TQString &name, Policy p)
{
- //TDevProject *project = part->project();
+ //KDevProject *project = part->project();
//TQString fileName = (p == Default) ? (project->projectDirectory() +
// "/templates/" + name) : name;
return readFile(part, fullPathForName(part, name, p) );
}
-TQString FileTemplate::readFile(TDevPlugin *part, const TQString &fileName)
+TQString FileTemplate::readFile(KDevPlugin *part, const TQString &fileName)
{
TQDomDocument &dom = *part->projectDom();
@@ -87,7 +87,7 @@ TQString FileTemplate::makeSubstitutions( TQDomDocument & dom, const TQString &
}
-bool FileTemplate::copy(TDevPlugin *part, const TQString &name,
+bool FileTemplate::copy(KDevPlugin *part, const TQString &name,
const TQString &dest, Policy p)
{
TQString text = read(part, name, p);
@@ -109,7 +109,7 @@ bool FileTemplate::copy(TDevPlugin *part, const TQString &name,
return true;
}
-TQString FileTemplate::fullPathForName(TDevPlugin *part, const TQString &name,
+TQString FileTemplate::fullPathForName(KDevPlugin *part, const TQString &name,
Policy p) {
// if Policy is not default, full path is just the name
if (p!=Default) return name;
@@ -123,6 +123,6 @@ TQString FileTemplate::fullPathForName(TDevPlugin *part, const TQString &name,
}
// next try global
- TQString globalName = ::locate("data", "tdevfilecreate/file-templates/" + name);
+ TQString globalName = ::locate("data", "kdevfilecreate/file-templates/" + name);
return globalName.isNull() ? fileName : globalName;
}
diff --git a/lib/util/filetemplate.h b/lib/util/filetemplate.h
index 7802f9b7..8f863535 100644
--- a/lib/util/filetemplate.h
+++ b/lib/util/filetemplate.h
@@ -22,7 +22,7 @@
#include <tqstring.h>
-class TDevPlugin;
+class KDevPlugin;
class TQDomDocument;
/**
@@ -49,21 +49,21 @@ public:
* exists in the current project. File templates
* are stored in the "templates" subdirectory of a project or in application shared dirs.
*/
- static bool exists(TDevPlugin *part, const TQString &name, Policy p = Default);
+ static bool exists(KDevPlugin *part, const TQString &name, Policy p = Default);
/**
* Reads a template with the given name (e.g. "cpp")
* and makes variable substitutions (like $AUTHOR$ etc.)
* in it. The resulting string is returned.
*/
- static TQString read(TDevPlugin *part, const TQString &name, Policy p = Default);
+ static TQString read(KDevPlugin *part, const TQString &name, Policy p = Default);
/**
* Reads a template with the given URL
* and makes variable substitutions (like $AUTHOR$ etc.)
* in it. The resulting string is returned.
*/
- static TQString readFile(TDevPlugin *part, const TQString &fileName);
+ static TQString readFile(KDevPlugin *part, const TQString &fileName);
/**
* Makes variable substitutions on a text, based on a specified TQDomDocument
@@ -76,13 +76,13 @@ public:
* file with the name dest and - while copying -
* performs variable substitutions.
*/
- static bool copy(TDevPlugin *part, const TQString &name,
+ static bool copy(KDevPlugin *part, const TQString &name,
const TQString &dest, Policy p = Default);
/**
* Translates a template name into a full path, or suggests a full path
* for the template in the project directory if it doesn't exist.
*/
- static TQString fullPathForName(TDevPlugin *part, const TQString &name, Policy p = Default);
+ static TQString fullPathForName(KDevPlugin *part, const TQString &name, Policy p = Default);
};
#endif
diff --git a/lib/util/tdeveditorutil.cpp b/lib/util/kdeveditorutil.cpp
index 455909f8..198e9a42 100644
--- a/lib/util/tdeveditorutil.cpp
+++ b/lib/util/kdeveditorutil.cpp
@@ -9,7 +9,7 @@
* *
***************************************************************************/
-#include "tdeveditorutil.h"
+#include "kdeveditorutil.h"
#include <tdetexteditor/document.h>
#include <tdetexteditor/view.h>
@@ -17,7 +17,7 @@
#include <tdetexteditor/editinterface.h>
#include <tdetexteditor/selectioninterface.h>
-bool TDevEditorUtil::currentPositionReal( unsigned int * line, unsigned int * col, KTextEditor::Document * doc, KTextEditor::View * view )
+bool KDevEditorUtil::currentPositionReal( unsigned int * line, unsigned int * col, KTextEditor::Document * doc, KTextEditor::View * view )
{
if ( !line || !col ) return false;
@@ -33,7 +33,7 @@ bool TDevEditorUtil::currentPositionReal( unsigned int * line, unsigned int * co
return true;
}
-TQString TDevEditorUtil::currentLine( KTextEditor::Document * doc, KTextEditor::View * view )
+TQString KDevEditorUtil::currentLine( KTextEditor::Document * doc, KTextEditor::View * view )
{
KTextEditor::EditInterface * editIface = dynamic_cast<KTextEditor::EditInterface*>( doc );
if ( !editIface ) return TQString();
@@ -50,7 +50,7 @@ TQString TDevEditorUtil::currentLine( KTextEditor::Document * doc, KTextEditor::
return editIface->textLine(line);
}
-TQString TDevEditorUtil::currentWord( KTextEditor::Document * doc, KTextEditor::View * view )
+TQString KDevEditorUtil::currentWord( KTextEditor::Document * doc, KTextEditor::View * view )
{
KTextEditor::EditInterface * editIface = dynamic_cast<KTextEditor::EditInterface*>( doc );
if ( !editIface ) return TQString();
@@ -78,7 +78,7 @@ TQString TDevEditorUtil::currentWord( KTextEditor::Document * doc, KTextEditor::
}
-TQString TDevEditorUtil::currentSelection( KTextEditor::Document * doc )
+TQString KDevEditorUtil::currentSelection( KTextEditor::Document * doc )
{
KTextEditor::SelectionInterface * selectIface = dynamic_cast<KTextEditor::SelectionInterface*>( doc );
return selectIface ? selectIface->selection() : TQString();
diff --git a/lib/util/tdeveditorutil.h b/lib/util/kdeveditorutil.h
index d69e914b..79a64fe1 100644
--- a/lib/util/tdeveditorutil.h
+++ b/lib/util/kdeveditorutil.h
@@ -9,8 +9,8 @@
* *
***************************************************************************/
-#ifndef TDEVEDITOR_H
-#define TDEVEDITOR_H
+#ifndef KDEVEDITOR_H
+#define KDEVEDITOR_H
namespace KTextEditor
{
@@ -25,9 +25,9 @@ Class with some common utility operations not currently supported by KTE
@author Jens Dagerbo <jens.dagerbo@swipnet.se>
*/
-class TDevEditorUtil
+class KDevEditorUtil
{
- TDevEditorUtil() {}
+ KDevEditorUtil() {}
public:
/**
diff --git a/lib/util/tdevjobtimer.cpp b/lib/util/kdevjobtimer.cpp
index 0e1465e0..b0b78250 100644
--- a/lib/util/tdevjobtimer.cpp
+++ b/lib/util/kdevjobtimer.cpp
@@ -9,31 +9,31 @@
* *
***************************************************************************/
-#include "tdevjobtimer.h"
+#include "kdevjobtimer.h"
-TDevJobTimer::TDevJobTimer( void * payload, TQObject *parent, const char *name)
+KDevJobTimer::KDevJobTimer( void * payload, TQObject *parent, const char *name)
: TQTimer(parent, name)
{
m_payload = payload;
connect( this, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()) );
}
-TDevJobTimer::~TDevJobTimer()
+KDevJobTimer::~KDevJobTimer()
{
}
-void TDevJobTimer::singleShot(int msec, TQObject * receiver, const char * member, void * payload)
+void KDevJobTimer::singleShot(int msec, TQObject * receiver, const char * member, void * payload)
{
- TDevJobTimer * p = new TDevJobTimer( payload );
+ KDevJobTimer * p = new KDevJobTimer( payload );
p->start( msec, true );
connect( p, TQT_SIGNAL(timeout(void*)), receiver, member );
}
-void TDevJobTimer::slotTimeout()
+void KDevJobTimer::slotTimeout()
{
emit timeout( m_payload );
m_payload = 0;
deleteLater();
}
-#include "tdevjobtimer.moc"
+#include "kdevjobtimer.moc"
diff --git a/lib/util/tdevjobtimer.h b/lib/util/kdevjobtimer.h
index 313e56e5..b0fa829e 100644
--- a/lib/util/tdevjobtimer.h
+++ b/lib/util/kdevjobtimer.h
@@ -9,12 +9,12 @@
* *
***************************************************************************/
-#ifndef TDEVJOBTIMER_H
-#define TDEVJOBTIMER_H
+#ifndef KDEVJOBTIMER_H
+#define KDEVJOBTIMER_H
#include <tqtimer.h>
-class TDevJobTimer : public TQTimer
+class KDevJobTimer : public TQTimer
{
Q_OBJECT
@@ -25,8 +25,8 @@ signals:
void timeout(void*);
private:
- TDevJobTimer( void * payload, TQObject *parent = 0, const char *name = 0);
- ~TDevJobTimer();
+ KDevJobTimer( void * payload, TQObject *parent = 0, const char *name = 0);
+ ~KDevJobTimer();
private slots:
void slotTimeout();
diff --git a/lib/util/tdevshellwidget.cpp b/lib/util/kdevshellwidget.cpp
index b5b8d195..b9220250 100644
--- a/lib/util/tdevshellwidget.cpp
+++ b/lib/util/kdevshellwidget.cpp
@@ -18,25 +18,25 @@
#include <kde_terminal_interface.h>
#include <kprocess.h>
-#include "tdevshellwidget.h"
+#include "kdevshellwidget.h"
-TDevShellWidget::TDevShellWidget(TQWidget *parent, const char *name)
+KDevShellWidget::KDevShellWidget(TQWidget *parent, const char *name)
: TQVBox(parent, name), m_doAutoActivate( false ), m_isRunning( false )
{
}
-TDevShellWidget::~TDevShellWidget()
+KDevShellWidget::~KDevShellWidget()
{
}
-void TDevShellWidget::setShell( const TQString & shell, const TQStrList & arguments )
+void KDevShellWidget::setShell( const TQString & shell, const TQStrList & arguments )
{
m_shellName = shell;
m_shellArguments = arguments;
}
-void TDevShellWidget::activate( )
+void KDevShellWidget::activate( )
{
KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart");
if ( !factory ) return;
@@ -67,7 +67,7 @@ void TDevShellWidget::activate( )
}
-void TDevShellWidget::partDestroyed( )
+void KDevShellWidget::partDestroyed( )
{
if ( m_doAutoActivate )
{
@@ -75,7 +75,7 @@ void TDevShellWidget::partDestroyed( )
}
}
-void TDevShellWidget::processExited( TDEProcess * proc )
+void KDevShellWidget::processExited( TDEProcess * proc )
{
m_isRunning = false;
@@ -89,7 +89,7 @@ void TDevShellWidget::processExited( TDEProcess * proc )
emit shellSignalled( proc->exitSignal() );
}
-void TDevShellWidget::sendInput( const TQString & text )
+void KDevShellWidget::sendInput( const TQString & text )
{
if ( !m_konsolePart ) return;
TerminalInterface* ti = static_cast<TerminalInterface*>( m_konsolePart->tqt_cast( "TerminalInterface" ) );
@@ -98,12 +98,12 @@ void TDevShellWidget::sendInput( const TQString & text )
ti->sendInput( text );
}
-bool TDevShellWidget::isRunning( )
+bool KDevShellWidget::isRunning( )
{
return m_isRunning;
}
-void TDevShellWidget::setAutoReactivateOnClose( bool doAutoActivate )
+void KDevShellWidget::setAutoReactivateOnClose( bool doAutoActivate )
{
// to auto reactivate can be dangerous, do it like this to avoid
// reactivating with a non-working setting (the partDestroyed()
@@ -114,12 +114,12 @@ void TDevShellWidget::setAutoReactivateOnClose( bool doAutoActivate )
m_doAutoActivate = false;
}
-void TDevShellWidget::setAutoReactivateOnCloseDelayed( )
+void KDevShellWidget::setAutoReactivateOnCloseDelayed( )
{
m_doAutoActivate = true;
}
-#include "tdevshellwidget.moc"
+#include "kdevshellwidget.moc"
// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off;
diff --git a/lib/util/tdevshellwidget.h b/lib/util/kdevshellwidget.h
index f6476814..6bb6a8d7 100644
--- a/lib/util/tdevshellwidget.h
+++ b/lib/util/kdevshellwidget.h
@@ -10,8 +10,8 @@
***************************************************************************/
-#ifndef TDEVSHELLWIDGET_H
-#define TDEVSHELLWIDGET_H
+#ifndef KDEVSHELLWIDGET_H
+#define KDEVSHELLWIDGET_H
#include <tqstrlist.h>
#include <tqvbox.h>
@@ -23,15 +23,15 @@ namespace KParts
class ReadOnlyPart;
}
-class TDevShellWidget : public TQVBox
+class KDevShellWidget : public TQVBox
{
Q_OBJECT
public:
- TDevShellWidget(TQWidget *parent = 0, const char *name = 0);
- virtual ~TDevShellWidget();
+ KDevShellWidget(TQWidget *parent = 0, const char *name = 0);
+ virtual ~KDevShellWidget();
/**
* Stores the shell name and arguments, that will be used in @ref activate()