summaryrefslogtreecommitdiffstats
path: root/parts/filecreate
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:51:01 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:51:01 -0600
commitb9e542d0c805e9adee3a67e44532d5321032e21e (patch)
treee82d85b9035cc2ca322911e8a6e38a3bd8b1d431 /parts/filecreate
parent7a392a04059bd904dab4c78910a6d34aa0b37798 (diff)
downloadtdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.tar.gz
tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'parts/filecreate')
-rw-r--r--parts/filecreate/fcconfigwidget.cpp8
-rw-r--r--parts/filecreate/filecreate_listitem.cpp2
-rw-r--r--parts/filecreate/filecreate_part.cpp4
-rw-r--r--parts/filecreate/filecreate_widget2.cpp2
4 files changed, 8 insertions, 8 deletions
diff --git a/parts/filecreate/fcconfigwidget.cpp b/parts/filecreate/fcconfigwidget.cpp
index 8b4ca11a..d703197c 100644
--- a/parts/filecreate/fcconfigwidget.cpp
+++ b/parts/filecreate/fcconfigwidget.cpp
@@ -178,7 +178,7 @@ void FCConfigWidget::saveGlobalConfig()
saveConfiguration(globalDom, fileTypes, true);
- TQFile config( KGlobal::dirs()->saveLocation("data", "kdevfilecreate/", true) + "template-info.xml" );
+ TQFile config( TDEGlobal::dirs()->saveLocation("data", "kdevfilecreate/", true) + "template-info.xml" );
config.open(IO_WriteOnly | IO_Truncate);
TQTextStream stream(&config);
stream << "<?xml version = '1.0'?>";
@@ -291,7 +291,7 @@ void FCConfigWidget::saveConfiguration(TQDomDocument &dom, TQDomElement &element
{
TQString dest;
if (global)
- dest = KGlobal::dirs()->saveLocation("data", "/kdevfilecreate/file-templates/", true);
+ dest = TDEGlobal::dirs()->saveLocation("data", "/kdevfilecreate/file-templates/", true);
else
dest = m_part->project()->projectDirectory() + "/templates/";
if (it.current()->text(4) == "create")
@@ -318,7 +318,7 @@ void FCConfigWidget::saveConfiguration(TQDomDocument &dom, TQDomElement &element
{
TQString dest;
if (global)
- dest = KGlobal::dirs()->saveLocation("data", "/kdevfilecreate/file-templates/", true);
+ dest = TDEGlobal::dirs()->saveLocation("data", "/kdevfilecreate/file-templates/", true);
else
dest = m_part->project()->projectDirectory() + "/templates/";
if (lastChild->text(4) == "create")
@@ -683,7 +683,7 @@ void FCConfigWidget::edit_type_content_button_clicked( )
}
else
{
- TQString dest = KGlobal::dirs()->saveLocation("data", "/kdevfilecreate/file-templates/", true);
+ TQString dest = TDEGlobal::dirs()->saveLocation("data", "/kdevfilecreate/file-templates/", true);
TQString typePath = dest + type_name;
KURL content;
content.setPath(typePath);
diff --git a/parts/filecreate/filecreate_listitem.cpp b/parts/filecreate/filecreate_listitem.cpp
index aa02fe23..09dd0dc4 100644
--- a/parts/filecreate/filecreate_listitem.cpp
+++ b/parts/filecreate/filecreate_listitem.cpp
@@ -82,7 +82,7 @@ namespace FileCreate {
setText(0, m_filetype->ext()!="" ? TQString("." + m_filetype->ext()) : TQString("") );
setText(1, "<qt><b>"+m_filetype->name()+"</b>. " + m_filetype->descr() );
- KIconLoader * loader = KGlobal::iconLoader();
+ KIconLoader * loader = TDEGlobal::iconLoader();
TQPixmap iconPix = loader->loadIcon(m_filetype->icon(), KIcon::Desktop,
KIcon::SizeMedium,
KIcon::DefaultState, NULL,
diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp
index 0f33b216..2a598f36 100644
--- a/parts/filecreate/filecreate_part.cpp
+++ b/parts/filecreate/filecreate_part.cpp
@@ -120,7 +120,7 @@ void FileCreatePart::insertConfigWidget( const KDialogBase * dlg, TQWidget * pag
void FileCreatePart::slotAboutToShowNewPopupMenu()
{
- KIconLoader * m_iconLoader = KGlobal::iconLoader();
+ KIconLoader * m_iconLoader = TDEGlobal::iconLoader();
m_newPopupMenu->clear();
delete m_subPopups;
m_subPopups = NULL;
@@ -524,7 +524,7 @@ TQString FileCreatePart::findGlobalXMLFile() const
{
int version = 0;
TQString filename;
- TQStringList filenames = KGlobal::instance()->dirs()->findAllResources("data", "kdevfilecreate/template-info.xml");
+ TQStringList filenames = TDEGlobal::instance()->dirs()->findAllResources("data", "kdevfilecreate/template-info.xml");
for( TQStringList::const_iterator it = filenames.begin(); it != filenames.end(); ++it )
{
TQDomDocument globalDom;
diff --git a/parts/filecreate/filecreate_widget2.cpp b/parts/filecreate/filecreate_widget2.cpp
index d934aba0..f2d67f25 100644
--- a/parts/filecreate/filecreate_widget2.cpp
+++ b/parts/filecreate/filecreate_widget2.cpp
@@ -43,7 +43,7 @@ namespace FileCreate {
setFocusStyle(FollowStyle);
setColumnStretchable(3, true);
- m_iconLoader = KGlobal::iconLoader();
+ m_iconLoader = TDEGlobal::iconLoader();
TQWhatsThis::add(this, i18n("Use this to create new files within your project."));