summaryrefslogtreecommitdiffstats
path: root/quanta/project
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
commit6c79d50fa9fbdff7f69ca57a8ab5fcc942375593 (patch)
treef47737d56c3239a0d8bc600674f0ca04b6e30d6e /quanta/project
parent36c36b53a129509d56fdaa0a7c9fcbcacd0c5826 (diff)
downloadtdewebdev-6c79d50fa9fbdff7f69ca57a8ab5fcc942375593.tar.gz
tdewebdev-6c79d50fa9fbdff7f69ca57a8ab5fcc942375593.zip
rename the following methods:
tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'quanta/project')
-rw-r--r--quanta/project/eventconfigurationdlg.cpp4
-rw-r--r--quanta/project/eventconfigurationdlg.h2
-rw-r--r--quanta/project/eventeditordlg.cpp4
-rw-r--r--quanta/project/eventeditordlg.h2
-rw-r--r--quanta/project/membereditdlg.cpp4
-rw-r--r--quanta/project/membereditdlg.h2
-rw-r--r--quanta/project/project.cpp6
-rw-r--r--quanta/project/project.h6
-rw-r--r--quanta/project/projectnewfinal.cpp4
-rw-r--r--quanta/project/projectnewfinal.h2
-rw-r--r--quanta/project/projectnewgeneral.cpp4
-rw-r--r--quanta/project/projectnewgeneral.h2
-rw-r--r--quanta/project/projectnewlocal.cpp16
-rw-r--r--quanta/project/projectnewlocal.h2
-rw-r--r--quanta/project/projectnewlocals.ui8
-rw-r--r--quanta/project/projectnewweb.cpp14
-rw-r--r--quanta/project/projectnewweb.h2
-rw-r--r--quanta/project/projectprivate.cpp104
-rw-r--r--quanta/project/projectprivate.h4
-rw-r--r--quanta/project/projectupload.cpp6
-rw-r--r--quanta/project/rescanprj.cpp4
-rw-r--r--quanta/project/rescanprj.h2
-rw-r--r--quanta/project/teammembersdlg.cpp4
-rw-r--r--quanta/project/teammembersdlg.h2
24 files changed, 105 insertions, 105 deletions
diff --git a/quanta/project/eventconfigurationdlg.cpp b/quanta/project/eventconfigurationdlg.cpp
index d50eb1e0..3c4e0024 100644
--- a/quanta/project/eventconfigurationdlg.cpp
+++ b/quanta/project/eventconfigurationdlg.cpp
@@ -29,8 +29,8 @@
#include "eventeditordlg.h"
#include "qpevents.h"
-EventConfigurationDlg::EventConfigurationDlg(KActionCollection *actionCollection, TQWidget* tqparent, const char* name, WFlags fl)
-: EventConfigurationDlgS(tqparent,name,fl)
+EventConfigurationDlg::EventConfigurationDlg(KActionCollection *actionCollection, TQWidget* parent, const char* name, WFlags fl)
+: EventConfigurationDlgS(parent,name,fl)
{
m_actionCollection = actionCollection;
}
diff --git a/quanta/project/eventconfigurationdlg.h b/quanta/project/eventconfigurationdlg.h
index 0d8a305b..db1933f0 100644
--- a/quanta/project/eventconfigurationdlg.h
+++ b/quanta/project/eventconfigurationdlg.h
@@ -30,7 +30,7 @@ class EventConfigurationDlg : public EventConfigurationDlgS
TQ_OBJECT
public:
- EventConfigurationDlg(KActionCollection *actionCollection, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+ EventConfigurationDlg(KActionCollection *actionCollection, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~EventConfigurationDlg();
void initEvents(EventActions *events);
void saveEvents(TQDomDocument dom);
diff --git a/quanta/project/eventeditordlg.cpp b/quanta/project/eventeditordlg.cpp
index 1bba3655..ddd22837 100644
--- a/quanta/project/eventeditordlg.cpp
+++ b/quanta/project/eventeditordlg.cpp
@@ -35,8 +35,8 @@ extern TQString taskLeaderStr;
extern TQString teamLeaderStr;
extern TQString subprojectLeaderStr;
-EventEditorDlg::EventEditorDlg(KActionCollection *actionCollection, TQWidget* tqparent, const char* name, WFlags fl)
-: EventEditorDlgS(tqparent,name,fl)
+EventEditorDlg::EventEditorDlg(KActionCollection *actionCollection, TQWidget* parent, const char* name, WFlags fl)
+: EventEditorDlgS(parent,name,fl)
{
m_actionCollection = actionCollection;
eventCombo->insertStringList(QPEvents::ref()->eventNames());
diff --git a/quanta/project/eventeditordlg.h b/quanta/project/eventeditordlg.h
index 73897b39..8cb4f10b 100644
--- a/quanta/project/eventeditordlg.h
+++ b/quanta/project/eventeditordlg.h
@@ -30,7 +30,7 @@ class EventEditorDlg : public EventEditorDlgS
TQ_OBJECT
public:
- EventEditorDlg(KActionCollection *actionCollection, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+ EventEditorDlg(KActionCollection *actionCollection, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~EventEditorDlg();
void setEvent(const TQString &name);
void setAction(const TQString &name);
diff --git a/quanta/project/membereditdlg.cpp b/quanta/project/membereditdlg.cpp
index 075f40c3..b7111b5b 100644
--- a/quanta/project/membereditdlg.cpp
+++ b/quanta/project/membereditdlg.cpp
@@ -38,8 +38,8 @@ TQString teamLeaderStr = I18N_NOOP("Team Leader");
TQString subprojectLeaderStr = I18N_NOOP("Subproject Leader");
-MemberEditDlg::MemberEditDlg(TQWidget *tqparent, const char *name)
- : MemberEditDlgS(tqparent, name)
+MemberEditDlg::MemberEditDlg(TQWidget *parent, const char *name)
+ : MemberEditDlgS(parent, name)
{
TQValueList<SubProject> *subprojects = Project::ref()->subprojects();
for (TQValueList<SubProject>::ConstIterator it = subprojects->constBegin(); it != subprojects->constEnd(); ++it)
diff --git a/quanta/project/membereditdlg.h b/quanta/project/membereditdlg.h
index c4173e91..2cecefb2 100644
--- a/quanta/project/membereditdlg.h
+++ b/quanta/project/membereditdlg.h
@@ -27,7 +27,7 @@ class MemberEditDlg : public MemberEditDlgS
Q_OBJECT
TQ_OBJECT
public:
- MemberEditDlg(TQWidget *tqparent = 0, const char *name = 0);
+ MemberEditDlg(TQWidget *parent = 0, const char *name = 0);
~MemberEditDlg();
void selectMember(const TQString &name);
diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp
index 3cc29461..ebc16264 100644
--- a/quanta/project/project.cpp
+++ b/quanta/project/project.cpp
@@ -68,15 +68,15 @@ extern TQString taskLeaderStr;
extern TQString teamLeaderStr;
extern TQString subprojectLeaderStr;
-Project::Project(KMainWindow *tqparent)
+Project::Project(KMainWindow *parent)
: TQObject()
{
d = new ProjectPrivate(this);
connect(d, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )));
- d->m_mainWindow = tqparent;
+ d->m_mainWindow = parent;
d->m_uploadDialog = 0L;
keepPasswd = true;
- d->initActions(tqparent->actionCollection());
+ d->initActions(parent->actionCollection());
}
Project::~Project()
diff --git a/quanta/project/project.h b/quanta/project/project.h
index 62b71889..8c25ccf9 100644
--- a/quanta/project/project.h
+++ b/quanta/project/project.h
@@ -64,10 +64,10 @@ public:
* the parameter is only used at the first call to create the class
*
*/
- static Project* const ref(KMainWindow *tqparent = 0L)
+ static Project* const ref(KMainWindow *parent = 0L)
{
static Project *m_ref;
- if (!m_ref) m_ref = new Project(tqparent);
+ if (!m_ref) m_ref = new Project(parent);
return m_ref;
}
@@ -212,7 +212,7 @@ private:
* If you need the class use Project::ref() for
* construction and reference
*/
- Project(KMainWindow *tqparent);
+ Project(KMainWindow *parent);
ProjectPrivate *d;
bool m_projectToolbarVisible;
diff --git a/quanta/project/projectnewfinal.cpp b/quanta/project/projectnewfinal.cpp
index 033df99e..05dd7cf4 100644
--- a/quanta/project/projectnewfinal.cpp
+++ b/quanta/project/projectnewfinal.cpp
@@ -26,8 +26,8 @@
#include "projectnewfinal.h"
#include "projectnewfinal.moc"
-ProjectNewFinal::ProjectNewFinal(TQWidget *tqparent, const char *name )
- : ProjectNewFinalS(tqparent,name)
+ProjectNewFinal::ProjectNewFinal(TQWidget *parent, const char *name )
+ : ProjectNewFinalS(parent,name)
{
imagelabel->setPixmap( UserIcon("wiznewprjfin") );
}
diff --git a/quanta/project/projectnewfinal.h b/quanta/project/projectnewfinal.h
index 578aaa47..67888701 100644
--- a/quanta/project/projectnewfinal.h
+++ b/quanta/project/projectnewfinal.h
@@ -28,7 +28,7 @@ class ProjectNewFinal : public ProjectNewFinalS {
Q_OBJECT
TQ_OBJECT
public:
- ProjectNewFinal(TQWidget *tqparent=0, const char *name=0);
+ ProjectNewFinal(TQWidget *parent=0, const char *name=0);
~ProjectNewFinal();
void setMargin(int);
diff --git a/quanta/project/projectnewgeneral.cpp b/quanta/project/projectnewgeneral.cpp
index 565785d6..08a2cc7f 100644
--- a/quanta/project/projectnewgeneral.cpp
+++ b/quanta/project/projectnewgeneral.cpp
@@ -39,8 +39,8 @@
#include "quantacommon.h"
#include "qextfileinfo.h"
-ProjectNewGeneral::ProjectNewGeneral(TQWidget *tqparent, const char *name )
- : ProjectNewGeneralS(tqparent,name)
+ProjectNewGeneral::ProjectNewGeneral(TQWidget *parent, const char *name )
+ : ProjectNewGeneralS(parent,name)
{
imagelabel->setPixmap( UserIcon("wiznewprjglb") );
linePrjName->setFocus();
diff --git a/quanta/project/projectnewgeneral.h b/quanta/project/projectnewgeneral.h
index 21c594f3..450183d2 100644
--- a/quanta/project/projectnewgeneral.h
+++ b/quanta/project/projectnewgeneral.h
@@ -30,7 +30,7 @@ class ProjectNewGeneral : public ProjectNewGeneralS {
Q_OBJECT
TQ_OBJECT
public:
- ProjectNewGeneral(TQWidget *tqparent=0, const char *name=0);
+ ProjectNewGeneral(TQWidget *parent=0, const char *name=0);
~ProjectNewGeneral();
TQString type();
diff --git a/quanta/project/projectnewlocal.cpp b/quanta/project/projectnewlocal.cpp
index 9c81cb51..47661767 100644
--- a/quanta/project/projectnewlocal.cpp
+++ b/quanta/project/projectnewlocal.cpp
@@ -45,8 +45,8 @@
#include "resource.h"
#include "quantacommon.h"
-ProjectNewLocal::ProjectNewLocal(TQWidget *tqparent, const char *name )
- : ProjectNewLocalS(tqparent,name)
+ProjectNewLocal::ProjectNewLocal(TQWidget *parent, const char *name )
+ : ProjectNewLocalS(parent,name)
{
imagelabel->setPixmap( UserIcon("wiznewprjloc") );
@@ -55,7 +55,7 @@ ProjectNewLocal::ProjectNewLocal(TQWidget *tqparent, const char *name )
listView->removeColumn(2);
listView->removeColumn(2);
- tqmask->setText("*");
+ mask->setText("*");
checkInsertWeb->setChecked( true );
@@ -116,13 +116,13 @@ KURL::List ProjectNewLocal::projectFiles()
!baseURL.path().endsWith("/") ||
!checkInsert->isChecked() ) return list;
- TQString ftqmask = "*";
+ TQString fmask = "*";
if ( checkInsertWeb->isChecked() )
{
KMimeType::List list = KMimeType::allMimeTypes();
KMimeType::List::iterator it;
TQString name;
- ftqmask = "";
+ fmask = "";
for ( it = list.begin(); it != list.end(); ++it )
{
name = (*it)->name();
@@ -133,16 +133,16 @@ KURL::List ProjectNewLocal::projectFiles()
TQStringList patterns = (*it)->patterns();
for (uint i = 0 ; i < patterns.count(); i++)
{
- ftqmask = ftqmask+patterns[i]+" ";
+ fmask = fmask+patterns[i]+" ";
}
}
}
} else
{
- ftqmask = tqmask->text();
+ fmask = mask->text();
}
- list = QExtFileInfo::allFilesRelative(baseURL, ftqmask, this, false);
+ list = QExtFileInfo::allFilesRelative(baseURL, fmask, this, false);
return list;
}
diff --git a/quanta/project/projectnewlocal.h b/quanta/project/projectnewlocal.h
index b1a984c9..4e3fd6d5 100644
--- a/quanta/project/projectnewlocal.h
+++ b/quanta/project/projectnewlocal.h
@@ -32,7 +32,7 @@ class ProjectNewLocal : public ProjectNewLocalS {
Q_OBJECT
TQ_OBJECT
public:
- ProjectNewLocal(TQWidget *tqparent=0, const char *name=0);
+ ProjectNewLocal(TQWidget *parent=0, const char *name=0);
~ProjectNewLocal();
KURL::List files();
diff --git a/quanta/project/projectnewlocals.ui b/quanta/project/projectnewlocals.ui
index 56ca7775..5b737924 100644
--- a/quanta/project/projectnewlocals.ui
+++ b/quanta/project/projectnewlocals.ui
@@ -156,12 +156,12 @@
<cstring>checkInsertWithMask</cstring>
</property>
<property name="text">
- <string>Insert files with the following &amp;tqmask:</string>
+ <string>Insert files with the following &amp;mask:</string>
</property>
</widget>
<widget class="TQLineEdit" row="1" column="1">
<property name="name">
- <cstring>tqmask</cstring>
+ <cstring>mask</cstring>
</property>
<property name="enabled">
<bool>false</bool>
@@ -319,7 +319,7 @@
<connection>
<sender>checkInsertWithMask</sender>
<signal>toggled(bool)</signal>
- <receiver>tqmask</receiver>
+ <receiver>mask</receiver>
<slot>setEnabled(bool)</slot>
</connection>
<connection>
@@ -332,7 +332,7 @@
<tabstops>
<tabstop>checkInsert</tabstop>
<tabstop>checkInsertWeb</tabstop>
- <tabstop>tqmask</tabstop>
+ <tabstop>mask</tabstop>
<tabstop>addFiles</tabstop>
<tabstop>addFolder</tabstop>
<tabstop>clearList</tabstop>
diff --git a/quanta/project/projectnewweb.cpp b/quanta/project/projectnewweb.cpp
index f4d4d765..a087497c 100644
--- a/quanta/project/projectnewweb.cpp
+++ b/quanta/project/projectnewweb.cpp
@@ -38,8 +38,8 @@
#include "quantacommon.h"
#include "uploadtreeview.h"
-ProjectNewWeb::ProjectNewWeb(TQWidget *tqparent, const char *name )
- : ProjectNewWebS(tqparent,name)
+ProjectNewWeb::ProjectNewWeb(TQWidget *parent, const char *name )
+ : ProjectNewWebS(parent,name)
{
button->setEnabled(false);
siteUrl->setFocus();
@@ -126,7 +126,7 @@ void ProjectNewWeb::slotStart()
{
start = true;
button->setText( i18n("Stop") );
- emit enableNextButton((TQWidget *)this->tqparent(),false);
+ emit enableNextButton((TQWidget *)this->parent(),false);
} else
{
KMessageBox::error(this, i18n("There was an error while trying to run the \"wget\" application.\
@@ -138,14 +138,14 @@ void ProjectNewWeb::slotStart()
KMessageBox::sorry(this,i18n("This feature is available only if the project lies on a local disk."));
start = false;
button->setText( i18n("Start") );
- emit enableNextButton((TQWidget *)this->tqparent(),true);
+ emit enableNextButton((TQWidget *)this->parent(),true);
}
} else
{
QuantaCommon::dirCreationError(this, baseURL);
start = false;
button->setText( i18n("Start") );
- emit enableNextButton((TQWidget *)this->tqparent(),true);
+ emit enableNextButton((TQWidget *)this->parent(),true);
}
} else {
@@ -155,7 +155,7 @@ void ProjectNewWeb::slotStart()
start = false;
button->setText( i18n("Start") );
- emit enableNextButton((TQWidget *)this->tqparent(),true);
+ emit enableNextButton((TQWidget *)this->parent(),true);
}
}
@@ -166,7 +166,7 @@ void ProjectNewWeb::slotGetWgetExited(KProcess*)
start = false;
button->setText( i18n("Start") );
emit messages(i18n("wget finished...\n"));
- emit enableNextButton((TQWidget *)this->tqparent(),true);
+ emit enableNextButton((TQWidget *)this->parent(),true);
}
void ProjectNewWeb::slotGetWgetOutput(KProcess *, char *buffer, int buflen)
diff --git a/quanta/project/projectnewweb.h b/quanta/project/projectnewweb.h
index 4e9c7088..596d1fe4 100644
--- a/quanta/project/projectnewweb.h
+++ b/quanta/project/projectnewweb.h
@@ -36,7 +36,7 @@ class ProjectNewWeb : public ProjectNewWebS {
Q_OBJECT
TQ_OBJECT
public:
- ProjectNewWeb(TQWidget *tqparent=0, const char *name=0);
+ ProjectNewWeb(TQWidget *parent=0, const char *name=0);
~ProjectNewWeb();
public slots:
diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp
index aee0dbec..52879849 100644
--- a/quanta/project/projectprivate.cpp
+++ b/quanta/project/projectprivate.cpp
@@ -65,7 +65,7 @@
ProjectPrivate::ProjectPrivate(Project *p)
: TQObject(), config(0L), m_dirWatch(0L), tempFile(0L), sessionTempFile(0L)
{
- tqparent = p;
+ parent = p;
m_projectFiles.setAutoDelete(true);
m_showUploadTreeviews = true;
m_eventsEnabled = true;
@@ -90,7 +90,7 @@ void ProjectPrivate::initActions(KActionCollection *ac)
this, TQT_SLOT( slotOpenProject() ),
ac, "project_open" );
m_projectRecent =
- KStdAction::openRecent(tqparent, TQT_SLOT(slotOpenProject(const KURL&)),
+ KStdAction::openRecent(parent, TQT_SLOT(slotOpenProject(const KURL&)),
ac, "project_open_recent");
m_projectRecent->setText(i18n("Open Recent Project"));
m_projectRecent->setIcon("project_open");
@@ -131,15 +131,15 @@ void ProjectPrivate::initActions(KActionCollection *ac)
ac, "project_insert_directory" );
rescanPrjDirAction = new KAction( i18n( "&Rescan Project Folder..." ), "reload", 0,
- tqparent, TQT_SLOT( slotRescanPrjDir() ),
+ parent, TQT_SLOT( slotRescanPrjDir() ),
ac, "project_rescan" );
uploadProjectAction = new KAction( i18n( "&Upload Project..." ), "up", Key_F8,
- tqparent, TQT_SLOT( slotUpload() ),
+ parent, TQT_SLOT( slotUpload() ),
ac, "project_upload" );
projectOptionAction = new KAction( i18n( "&Project Properties" ), "configure", SHIFT + Key_F7,
- tqparent, TQT_SLOT( slotOptions() ),
+ parent, TQT_SLOT( slotOptions() ),
ac, "project_options" );
saveAsProjectTemplateAction =
@@ -157,7 +157,7 @@ void ProjectPrivate::initActions(KActionCollection *ac)
void ProjectPrivate::adjustActions()
{
- bool projectExists = tqparent->hasProject();
+ bool projectExists = parent->hasProject();
closeprjAction->setEnabled(projectExists);
openPrjViewAction->setEnabled(projectExists);
savePrjViewAction->setEnabled(projectExists);
@@ -173,7 +173,7 @@ void ProjectPrivate::adjustActions()
saveSelectionAsProjectTemplateAction->setEnabled(projectExists);
adjustViewActions();
- tqparent->slotShowProjectToolbar(projectExists);
+ parent->slotShowProjectToolbar(projectExists);
}
@@ -263,19 +263,19 @@ void ProjectPrivate::openCurrentView()
} else {
if (el2.nodeName() == "viewtoolbar")
{
- tqparent->loadToolbarFile(url);
+ parent->loadToolbarFile(url);
}
}
}
// first we open what we want, might be that a wanted file is already open!
- tqparent->openFiles(urlsToOpen, m_defaultEncoding);
+ parent->openFiles(urlsToOpen, m_defaultEncoding);
// second we close what we don't want
KURL::List openURLs = ViewManager::ref()->openedFiles(true); // get open urls
KURL::List::Iterator it;
for ( it = openURLs.begin(); it != openURLs.end(); ++it )
{
if (urlsInView.findIndex( *it ) == -1)
- tqparent->closeFile (*it);
+ parent->closeFile (*it);
}
break;
}
@@ -299,7 +299,7 @@ void ProjectPrivate::insertFiles( KURL::List files )
{
TQDomElement el;
TQDomNodeList nl = dom.elementsByTagName("item");
- tqparent->statusMsg( i18n("Adding files to the project...") );
+ parent->statusMsg( i18n("Adding files to the project...") );
progressBar->setTotalSteps(2 * files.count() - 2);
progressBar->setValue(0);
progressBar->setTextEnabled(true);
@@ -350,19 +350,19 @@ void ProjectPrivate::insertFiles( KURL::List files )
progressBar->setValue(0);
progressBar->setTextEnabled(false);
- tqparent->reloadTree(&(m_projectFiles), false, TQStringList());
- tqparent->newtqStatus();
- tqparent->statusMsg(TQString());
+ parent->reloadTree(&(m_projectFiles), false, TQStringList());
+ parent->newtqStatus();
+ parent->statusMsg(TQString());
}
/** insert files from dir recursive */
-void ProjectPrivate::insertFiles(const KURL& pathURL, const TQString& tqmask )
+void ProjectPrivate::insertFiles(const KURL& pathURL, const TQString& mask )
{
KURL::List list;
list.append(pathURL);
- list += QExtFileInfo::allFiles(pathURL, tqmask, m_mainWindow);
+ list += QExtFileInfo::allFiles(pathURL, mask, m_mainWindow);
insertFiles(list);
}
@@ -371,7 +371,7 @@ void ProjectPrivate::loadProjectXML()
{
//TODO: Optimize reading. For example iterate through all the nodes and handle them
//according to the found node type
- tqparent->statusMsg( i18n("Reading the project file...") );
+ parent->statusMsg( i18n("Reading the project file...") );
TQDomNode no;
TQDomElement el;
KURL url;
@@ -380,7 +380,7 @@ void ProjectPrivate::loadProjectXML()
if ( projectNode.isNull() || projectName.isEmpty() )
{
- tqparent->hideSplash();
+ parent->hideSplash();
KMessageBox::sorry(m_mainWindow, i18n("Invalid project file.") );
adjustActions();
return;
@@ -696,10 +696,10 @@ void ProjectPrivate::loadProjectXML()
}
- tqparent->statusMsg(TQString());
- tqparent->newProjectLoaded(projectName, baseURL, templateURL);
- tqparent->reloadTree(&(m_projectFiles), true, treeStatusFromXML());
- tqparent->newtqStatus();
+ parent->statusMsg(TQString());
+ parent->newProjectLoaded(projectName, baseURL, templateURL);
+ parent->reloadTree(&(m_projectFiles), true, treeStatusFromXML());
+ parent->newtqStatus();
adjustActions();
}
@@ -723,7 +723,7 @@ void ProjectPrivate::slotAcceptCreateProject()
/*
it is important to set the fields only if there is some input
otherwise you set them to an empty string and the treeview will
- not recognize it as tqparent url because:
+ not recognize it as parent url because:
TQString::Null != ""
*/
if (!png->lineHost->text().isEmpty())
@@ -806,7 +806,7 @@ void ProjectPrivate::slotAcceptCreateProject()
{
KURL url;
QuantaCommon::setUrl(url, qConfig.globalDataDir + resourceDir + "templates/");
- tqparent->slotAddDirectory(url, false);
+ parent->slotAddDirectory(url, false);
QuantaCommon::setUrl(templateURL, "templates/");
createTemplateDir = false;
}
@@ -814,7 +814,7 @@ void ProjectPrivate::slotAcceptCreateProject()
{
KURL url;
QuantaCommon::setUrl(url, locateLocal("data", resourceDir + "templates/"));
- tqparent->slotAddDirectory(url, false);
+ parent->slotAddDirectory(url, false);
QuantaCommon::setUrl(templateURL, "templates/");
createTemplateDir = false;
}
@@ -890,7 +890,7 @@ void ProjectPrivate::slotDeleteProjectView(const TQString &view)
node.parentNode().removeChild(node);
if (currentProjectView == view)
currentProjectView = "";
- tqparent->setModified();
+ parent->setModified();
adjustViewActions();
break;
}
@@ -945,7 +945,7 @@ void ProjectPrivate::slotSaveAsProjectView(bool askForName)
}
KURL::List toolbarList;
- tqparent->getUserToolbarFiles(&toolbarList);
+ parent->getUserToolbarFiles(&toolbarList);
for (uint i =0 ; i < toolbarList.count(); i++)
{
item = dom.createElement("viewtoolbar");
@@ -956,7 +956,7 @@ void ProjectPrivate::slotSaveAsProjectView(bool askForName)
}
dom.firstChild().firstChild().appendChild( el );
- tqparent->setModified();
+ parent->setModified();
adjustViewActions();
}
@@ -1055,7 +1055,7 @@ bool ProjectPrivate::createEmptyDom()
if (!result)
{
- tqparent->hideSplash();
+ parent->hideSplash();
KMessageBox::sorry(m_mainWindow, i18n("<qt>Cannot open file <b>%1</b> for writing.</qt>").tqarg(projectURL.prettyURL(0, KURL::StripFileProtocol)));
delete tempFile;
tempFile = 0L;
@@ -1099,7 +1099,7 @@ void ProjectPrivate::getStatusFromTree()
i--;
}
TQStringList folderList;
- tqparent->getTreetqStatus( &folderList );
+ parent->getTreetqStatus( &folderList );
// toplevel folder is always open in a project and QExtFileInfo::toRelative
// creates strange output -> we remove the toplevel folder
if (folderList.count() > 0)
@@ -1159,9 +1159,9 @@ void ProjectPrivate::slotNewProject()
connect(wiz, TQT_SIGNAL(helpClicked()), TQT_SLOT(slotNewProjectHelpClicked()));
connect( pnw, TQT_SIGNAL(enableMessagesWidget()),
- tqparent, TQT_SIGNAL(enableMessageWidget()));
+ parent, TQT_SIGNAL(enableMessageWidget()));
connect( pnw, TQT_SIGNAL(messages(const TQString&)),
- tqparent, TQT_SLOT (slotGetMessages(const TQString&)));
+ parent, TQT_SLOT (slotGetMessages(const TQString&)));
connect( pnw, TQT_SIGNAL(enableNextButton(TQWidget *,bool)),
wiz, TQT_SLOT(setNextEnabled(TQWidget*,bool)));
connect( pnw, TQT_SIGNAL(enableNextButton(TQWidget *,bool)),
@@ -1197,15 +1197,15 @@ void ProjectPrivate::slotNewProject()
delete wiz;
adjustActions();
- tqparent->newtqStatus();
+ parent->newtqStatus();
}
/** close project and edited files */
void ProjectPrivate::slotCloseProject()
{
- if (!tqparent->hasProject()) return;
+ if (!parent->hasProject()) return;
connect(ViewManager::ref(), TQT_SIGNAL(filesClosed(bool)), this, TQT_SLOT(slotProceedWithCloseProject(bool)));
- tqparent->closeFiles();
+ parent->closeFiles();
}
void ProjectPrivate::slotProceedWithCloseProject(bool success)
@@ -1226,11 +1226,11 @@ void ProjectPrivate::slotProceedWithCloseProject(bool success)
config->setGroup("Projects");
config->writePathEntry("Last Project", TQString());
init();
- tqparent->newProjectLoaded(projectName, baseURL, templateURL);
- tqparent->reloadTree( &(m_projectFiles), true, TQStringList());
+ parent->newProjectLoaded(projectName, baseURL, templateURL);
+ parent->reloadTree( &(m_projectFiles), true, TQStringList());
adjustActions();
m_projectRecent->setCurrentItem(-1);
- tqparent->newtqStatus();
+ parent->newtqStatus();
kapp->tqprocessEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
}
@@ -1252,7 +1252,7 @@ void ProjectPrivate::slotOpenProject()
/* save project file */
bool ProjectPrivate::saveProject()
{
- if ( !tqparent->hasProject() ) return false;
+ if ( !parent->hasProject() ) return false;
bool result = true;
// remove old opened files
TQDomElement el;
@@ -1284,10 +1284,10 @@ bool ProjectPrivate::saveProject()
f.close();
}
m_modified = false;
- tqparent->statusMsg(i18n( "Wrote project file %1" ).tqarg(m_tmpProjectFile));
+ parent->statusMsg(i18n( "Wrote project file %1" ).tqarg(m_tmpProjectFile));
} else
{
- tqparent->hideSplash();
+ parent->hideSplash();
KMessageBox::error(m_mainWindow, i18n("<qt>Cannot open the file <b>%1</b> for writing.</qt>").tqarg(m_tmpProjectFile));
result = false;
}
@@ -1338,7 +1338,7 @@ void ProjectPrivate::loadProjectFromTemp(const KURL &url, const TQString &tempFi
writeConfig();
} else
{
- tqparent->hideSplash();
+ parent->hideSplash();
KMessageBox::error(m_mainWindow, i18n("<qt>Cannot open the file <b>%1</b> for reading.</qt>").tqarg(tempFile));
}
}
@@ -1350,13 +1350,13 @@ bool ProjectPrivate::loadProject(const KURL &url)
return true;
if (!url.isValid())
{
- tqparent->hideSplash();
+ parent->hideSplash();
KMessageBox::sorry(m_mainWindow, i18n("<qt>Malformed URL: <b>%1</b></qt>").tqarg(url.prettyURL()));
return false;
}
if ( projectAlreadyOpen(url.url()) )
{
- tqparent->hideSplash();
+ parent->hideSplash();
if (KMessageBox::warningContinueCancel(m_mainWindow, i18n("<qt>The project<br><b>%1</b><br> seems to be used by another Quanta instance.<br>You may end up with data loss if you open the same project in two instances, modify and save them in both.<br><br>Do you want to proceed with open?</qt>").tqarg(url.prettyURL()), TQString(), KStdGuiItem::open()) == KMessageBox::Cancel)
return false;
}
@@ -1367,7 +1367,7 @@ bool ProjectPrivate::loadProject(const KURL &url)
if (KIO::NetAccess::exists(url, false, m_mainWindow) &&
KIO::NetAccess::download(url, projectTmpFile, m_mainWindow))
{
- if (tqparent->hasProject())
+ if (parent->hasProject())
{
slotCloseProject();
}
@@ -1415,7 +1415,7 @@ bool ProjectPrivate::loadProject(const KURL &url)
loadProjectFromTemp(url, projectTmpFile, sessionTmpFile);
} else
{
- tqparent->hideSplash();
+ parent->hideSplash();
KMessageBox::error(m_mainWindow, i18n("<qt>Cannot access the project file <b>%1</b>.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)));
return false;
}
@@ -1448,7 +1448,7 @@ void ProjectPrivate::slotAddFiles()
CopyTo *dlg = new CopyTo( baseURL);
connect(dlg, TQT_SIGNAL(deleteDialog(CopyTo*)),
TQT_SLOT (slotDeleteCopytoDlg(CopyTo*)));
- connect(dlg, TQT_SIGNAL(addFilesToProject(const KURL::List&)), tqparent,
+ connect(dlg, TQT_SIGNAL(addFilesToProject(const KURL::List&)), parent,
TQT_SLOT (slotInsertFilesAfterCopying(const KURL::List&)));
list = dlg->copy( list, destination );
return;
@@ -1470,7 +1470,7 @@ void ProjectPrivate::slotAddFiles()
}
}
- tqparent->reloadTree( &(m_projectFiles), false, TQStringList());
+ parent->reloadTree( &(m_projectFiles), false, TQStringList());
}
}
@@ -1487,7 +1487,7 @@ void ProjectPrivate::slotAddDirectory()
KURL url = KURL();
url = KFileDialog::getExistingURL(baseURL.prettyURL(), m_mainWindow,
i18n("Insert Folder in Project"));
- tqparent->slotAddDirectory(url);
+ parent->slotAddDirectory(url);
}
@@ -1531,7 +1531,7 @@ void ProjectPrivate::slotDebuggerOptions()
}
else
{
- tqparent->hideSplash();
+ parent->hideSplash();
KMessageBox::error(NULL, i18n("<qt>Unable to load the debugger plugin, error code %1 was returned: <b>%2</b>.</qt>").tqarg(errCode).tqarg(KLibLoader::self()->lastErrorMessage()), i18n("Debugger Error"));
}
}
@@ -1639,7 +1639,7 @@ bool ProjectPrivate::uploadProjectFile()
{
removeFromConfig(projectURL.url()); // remove the project from the list of open projects
if (quantaApp)
- tqparent->statusMsg(i18n( "Uploaded project file %1" ).tqarg( projectURL.prettyURL()));
+ parent->statusMsg(i18n( "Uploaded project file %1" ).tqarg( projectURL.prettyURL()));
// delete all temp files we used
// first the one from creating a new project
delete tempFile;
@@ -1659,7 +1659,7 @@ bool ProjectPrivate::uploadProjectFile()
{
if (quantaApp)
{
- tqparent->statusMsg(TQString() );
+ parent->statusMsg(TQString() );
KMessageBox::error(m_mainWindow, KIO::NetAccess::lastErrorString());
}
return false;
diff --git a/quanta/project/projectprivate.h b/quanta/project/projectprivate.h
index 6c5adf12..d3eeec0b 100644
--- a/quanta/project/projectprivate.h
+++ b/quanta/project/projectprivate.h
@@ -57,7 +57,7 @@ public:
~ProjectPrivate();
- Project *tqparent;
+ Project *parent;
/** Point to the .webprj file */
KURL projectURL;
TQString projectName;
@@ -148,7 +148,7 @@ upload.*/
void insertFiles( KURL::List files );
/** insert files from dir recursive */
- void insertFiles(const KURL& pathURL, const TQString& tqmask );
+ void insertFiles(const KURL& pathURL, const TQString& mask );
void loadProjectXML();
diff --git a/quanta/project/projectupload.cpp b/quanta/project/projectupload.cpp
index dbd21dbf..ba267753 100644
--- a/quanta/project/projectupload.cpp
+++ b/quanta/project/projectupload.cpp
@@ -800,10 +800,10 @@ void ProjectUpload::loadRemoteUploadInfo()
void ProjectUpload::saveRemoteUploadInfo()
{
- TQDomNode tqparent = m_currentProfileElement.parentNode();
+ TQDomNode parent = m_currentProfileElement.parentNode();
TQDomNode profileNode = m_currentProfileElement.cloneNode(false);
- tqparent.removeChild(m_currentProfileElement);
- tqparent.appendChild(profileNode);
+ parent.removeChild(m_currentProfileElement);
+ parent.appendChild(profileNode);
TQMap<TQString, int>::ConstIterator it;
for (it = m_uploadTimeList.constBegin(); it != m_uploadTimeList.constEnd(); ++it)
{
diff --git a/quanta/project/rescanprj.cpp b/quanta/project/rescanprj.cpp
index 2b4cc8e4..9904cdf2 100644
--- a/quanta/project/rescanprj.cpp
+++ b/quanta/project/rescanprj.cpp
@@ -40,8 +40,8 @@
RescanPrj::RescanPrj(const ProjectList &p_prjFileList, const KURL& p_baseURL, const TQRegExp &p_excludeRx,
- TQWidget *tqparent, const char *name, bool modal )
- : RescanPrjDir(tqparent,name,modal)
+ TQWidget *parent, const char *name, bool modal )
+ : RescanPrjDir(parent,name,modal)
{
setCaption(name);
diff --git a/quanta/project/rescanprj.h b/quanta/project/rescanprj.h
index 39a03bb0..0f0df657 100644
--- a/quanta/project/rescanprj.h
+++ b/quanta/project/rescanprj.h
@@ -37,7 +37,7 @@ class RescanPrj : public RescanPrjDir {
TQ_OBJECT
public:
RescanPrj(const ProjectList &p_prjFileList, const KURL& p_baseURL, const TQRegExp &p_excludeRx,
- TQWidget *tqparent=0, const char *name=0, bool modal = true);
+ TQWidget *parent=0, const char *name=0, bool modal = true);
~RescanPrj();
public slots:
diff --git a/quanta/project/teammembersdlg.cpp b/quanta/project/teammembersdlg.cpp
index f2fe6ad2..6d4ffa69 100644
--- a/quanta/project/teammembersdlg.cpp
+++ b/quanta/project/teammembersdlg.cpp
@@ -42,8 +42,8 @@ extern TQString taskLeaderStr;
extern TQString teamLeaderStr;
extern TQString subprojectLeaderStr;
-TeamMembersDlg::TeamMembersDlg(TQWidget *tqparent, const char *name)
- : TeamMembersDlgS(tqparent, name)
+TeamMembersDlg::TeamMembersDlg(TQWidget *parent, const char *name)
+ : TeamMembersDlgS(parent, name)
{
m_yourself = "";
}
diff --git a/quanta/project/teammembersdlg.h b/quanta/project/teammembersdlg.h
index 2884fb1c..9a97ac0a 100644
--- a/quanta/project/teammembersdlg.h
+++ b/quanta/project/teammembersdlg.h
@@ -27,7 +27,7 @@ class TeamMembersDlg : public TeamMembersDlgS
Q_OBJECT
TQ_OBJECT
public:
- TeamMembersDlg(TQWidget *tqparent = 0, const char *name = 0);
+ TeamMembersDlg(TQWidget *parent = 0, const char *name = 0);
~TeamMembersDlg();
void setYourself(const TQString &name);