summaryrefslogtreecommitdiffstats
path: root/kimagemapeditor
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-17 03:03:11 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-17 03:03:11 +0000
commita2bae01d006ea8053e85bc16d09a8cf40a4b0b75 (patch)
tree7f2b2a1d90d0d5fbcbf23e06962192923058e0ad /kimagemapeditor
parent4e0c064056c23aabc053dc4a54d82ff1dceaf6a9 (diff)
downloadtdewebdev-a2bae01d006ea8053e85bc16d09a8cf40a4b0b75.tar.gz
tdewebdev-a2bae01d006ea8053e85bc16d09a8cf40a4b0b75.zip
Fix kdewebdev FTBFS under Qt3
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1237074 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kimagemapeditor')
-rw-r--r--kimagemapeditor/kimagemapeditor.cpp4
-rw-r--r--kimagemapeditor/qextfileinfo.cpp58
-rw-r--r--kimagemapeditor/qextfileinfo.h6
3 files changed, 34 insertions, 34 deletions
diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp
index ba5183e0..cfb5ee8c 100644
--- a/kimagemapeditor/kimagemapeditor.cpp
+++ b/kimagemapeditor/kimagemapeditor.cpp
@@ -2295,7 +2295,7 @@ void KImageMapEditor::saveImageMap(const KURL & url)
<< "<body>\n"
<< " " << getHTMLImageMap()
<< "\n"
- << " <img src=\"" << TQExtFileInfo::toRelative(_imageUrl,KURL( url.directory() )).path() << "\""
+ << " <img src=\"" << QExtFileInfo::toRelative(_imageUrl,KURL( url.directory() )).path() << "\""
<< " usemap=\"#" << _mapName << "\""
<< " width=\"" << drawZone->picture().width() << "\""
<< " height=\"" << drawZone->picture().height() << "\">\n"
@@ -2671,7 +2671,7 @@ void KImageMapEditor::addImage(const KURL & imgUrl) {
if (imgUrl.isEmpty())
return;
- TQString relativePath ( TQExtFileInfo::toRelative(imgUrl, KURL( url().directory() )).path() );
+ TQString relativePath ( QExtFileInfo::toRelative(imgUrl, KURL( url().directory() )).path() );
TQString imgHtml = TQString("<img src=\"")+relativePath+TQString("\">");
ImageTag *imgTag = new ImageTag();
diff --git a/kimagemapeditor/qextfileinfo.cpp b/kimagemapeditor/qextfileinfo.cpp
index 19c638cf..072a854e 100644
--- a/kimagemapeditor/qextfileinfo.cpp
+++ b/kimagemapeditor/qextfileinfo.cpp
@@ -32,10 +32,10 @@
//app includes
#include "qextfileinfo.h"
-TQString TQExtFileInfo::lastErrorMsg = "";
+TQString QExtFileInfo::lastErrorMsg = "";
/** create a relative short url based in baseURL*/
-KURL TQExtFileInfo::toRelative(const KURL& urlToConvert,const KURL& baseURL)
+KURL QExtFileInfo::toRelative(const KURL& urlToConvert,const KURL& baseURL)
{
KURL resultURL = urlToConvert;
if (urlToConvert.protocol() == baseURL.protocol())
@@ -79,7 +79,7 @@ KURL TQExtFileInfo::toRelative(const KURL& urlToConvert,const KURL& baseURL)
return resultURL;
}
/** convert relative filename to absolute */
-KURL TQExtFileInfo::toAbsolute(const KURL& urlToConvert,const KURL& baseURL)
+KURL QExtFileInfo::toAbsolute(const KURL& urlToConvert,const KURL& baseURL)
{
KURL resultURL = urlToConvert;
if (urlToConvert.protocol() == baseURL.protocol() && !urlToConvert.path().startsWith("/"))
@@ -105,27 +105,27 @@ KURL TQExtFileInfo::toAbsolute(const KURL& urlToConvert,const KURL& baseURL)
This is needed for empty directory adding/handling. (Andras)
Currently works only for local directories
*/
-KURL::List TQExtFileInfo::allFiles( const KURL& path, const TQString& tqmask)
+KURL::List QExtFileInfo::allFiles( const KURL& path, const TQString& tqmask)
{
- TQExtFileInfo internalFileInfo;
+ QExtFileInfo internalFileInfo;
return internalFileInfo.allFilesInternal(path, tqmask);
}
-KURL::List TQExtFileInfo::allFilesRelative( const KURL& path, const TQString& tqmask)
+KURL::List QExtFileInfo::allFilesRelative( const KURL& path, const TQString& tqmask)
{
- TQExtFileInfo internalFileInfo;
+ QExtFileInfo internalFileInfo;
KURL::List r = internalFileInfo.allFilesInternal( path, tqmask);
KURL::List::Iterator it;
for ( it = r.begin(); it != r.end(); ++it )
{
- *it = TQExtFileInfo::toRelative( *it, path );
+ *it = QExtFileInfo::toRelative( *it, path );
}
return r;
}
-bool TQExtFileInfo::createDir( const KURL& path )
+bool QExtFileInfo::createDir( const KURL& path )
{
int i=0;
bool result;
@@ -150,7 +150,7 @@ bool TQExtFileInfo::createDir( const KURL& path )
return result;
}
-KURL TQExtFileInfo::cdUp(const KURL &url)
+KURL QExtFileInfo::cdUp(const KURL &url)
{
KURL u = url;
TQString dir = u.path(-1);
@@ -162,17 +162,17 @@ KURL TQExtFileInfo::cdUp(const KURL &url)
return u;
}
-TQString TQExtFileInfo::shortName(const TQString &fname)
+TQString QExtFileInfo::shortName(const TQString &fname)
{
return fname.section("/",-1);
}
-KURL TQExtFileInfo::path( const KURL &url )
+KURL QExtFileInfo::path( const KURL &url )
{
return KURL( url.directory(false,false) );
}
-KURL TQExtFileInfo::home()
+KURL QExtFileInfo::home()
{
KURL url;
url.setPath(TQDir::currentDirPath()+"/");
@@ -180,7 +180,7 @@ KURL TQExtFileInfo::home()
}
-bool TQExtFileInfo::exists(const KURL& a_url)
+bool QExtFileInfo::exists(const KURL& a_url)
{
// Andras: Don't use it now, as it brings up an extra dialog and need manual
// intervention when usign fish
@@ -192,21 +192,21 @@ bool TQExtFileInfo::exists(const KURL& a_url)
return TQFile::exists( a_url.path() );
} else
{
- TQExtFileInfo internalFileInfo;
+ QExtFileInfo internalFileInfo;
return internalFileInfo.internalExists(a_url);
}
}
/* Synchronouse copy, like NetAccess::file_copy in KDE 3.2 */
-bool TQExtFileInfo::copy( const KURL& src, const KURL& target, int permissions,
+bool QExtFileInfo::copy( const KURL& src, const KURL& target, int permissions,
bool overwrite, bool resume, TQWidget* window )
{
- TQExtFileInfo internalFileInfo;
+ QExtFileInfo internalFileInfo;
return internalFileInfo.internalCopy( src, target, permissions, overwrite, resume, window );
}
/** No descriptions */
-KURL::List TQExtFileInfo::allFilesInternal(const KURL& startURL, const TQString& tqmask)
+KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString& tqmask)
{
dirListItems.clear();
if (internalExists(startURL))
@@ -240,10 +240,10 @@ KURL::List TQExtFileInfo::allFilesInternal(const KURL& startURL, const TQString&
//Some hackery from KIO::NetAccess as they do not do exactly what we want
/* return true if the url exists*/
-bool TQExtFileInfo::internalExists(const KURL& url)
+bool QExtFileInfo::internalExists(const KURL& url)
{
bJobOK = true;
- // kdDebug(24000)<<"TQExtFileInfo::internalExists"<<endl;
+ // kdDebug(24000)<<"QExtFileInfo::internalExists"<<endl;
KIO::StatJob * job = KIO::stat( url, false);
job->setDetails(0);
job->setSide(false); //check the url for writing
@@ -252,13 +252,13 @@ bool TQExtFileInfo::internalExists(const KURL& url)
//To avoid lock-ups, start a timer.
TQTimer::singleShot(10*1000, this,TQT_SLOT(slotTimeout()));
-// kdDebug(24000)<<"TQExtFileInfo::internalExists:before enter_loop"<<endl;
+// kdDebug(24000)<<"QExtFileInfo::internalExists:before enter_loop"<<endl;
enter_loop();
-// kdDebug(24000)<<"TQExtFileInfo::internalExists:after enter_loop"<<endl;
+// kdDebug(24000)<<"QExtFileInfo::internalExists:after enter_loop"<<endl;
return bJobOK;
}
-bool TQExtFileInfo::internalCopy(const KURL& src, const KURL& target, int permissions,
+bool QExtFileInfo::internalCopy(const KURL& src, const KURL& target, int permissions,
bool overwrite, bool resume, TQWidget* window)
{
bJobOK = true; // success unless further error occurs
@@ -277,18 +277,18 @@ bool TQExtFileInfo::internalCopy(const KURL& src, const KURL& target, int permis
void qt_enter_modal( TQWidget *widget );
void qt_leave_modal( TQWidget *widget );
-void TQExtFileInfo::enter_loop()
+void QExtFileInfo::enter_loop()
{
TQWidget dummy(0,0,WType_Dialog | WShowModal);
dummy.setFocusPolicy( TQ_NoFocus );
qt_enter_modal(&dummy);
-// kdDebug(24000)<<"TQExtFileInfo::enter_loop:before tqApp->enter_loop()"<<endl;
+// kdDebug(24000)<<"QExtFileInfo::enter_loop:before tqApp->enter_loop()"<<endl;
tqApp->enter_loop();
-// kdDebug(24000)<<"TQExtFileInfo::enter_loop:after tqApp->enter_loop()"<<endl;
+// kdDebug(24000)<<"QExtFileInfo::enter_loop:after tqApp->enter_loop()"<<endl;
qt_leave_modal(&dummy);
}
-void TQExtFileInfo::slotResult( KIO::Job * job )
+void QExtFileInfo::slotResult( KIO::Job * job )
{
bJobOK = !job->error();
if ( !bJobOK )
@@ -301,7 +301,7 @@ void TQExtFileInfo::slotResult( KIO::Job * job )
tqApp->exit_loop();
}
-void TQExtFileInfo::slotNewEntries(KIO::Job *job, const KIO::UDSEntryList& udsList)
+void QExtFileInfo::slotNewEntries(KIO::Job *job, const KIO::UDSEntryList& udsList)
{
KURL url = static_cast<KIO::ListJob *>(job)->url();
url.adjustPath(-1);
@@ -339,7 +339,7 @@ void TQExtFileInfo::slotNewEntries(KIO::Job *job, const KIO::UDSEntryList& udsLi
}
/** Timeout occured while waiting for some network function to return. */
-void TQExtFileInfo::slotTimeout()
+void QExtFileInfo::slotTimeout()
{
bJobOK = false;
tqApp->exit_loop();
diff --git a/kimagemapeditor/qextfileinfo.h b/kimagemapeditor/qextfileinfo.h
index 7842e338..00643915 100644
--- a/kimagemapeditor/qextfileinfo.h
+++ b/kimagemapeditor/qextfileinfo.h
@@ -21,13 +21,13 @@
#include <tqptrlist.h>
#include <tqregexp.h>
-class TQExtFileInfo:public TQObject
+class QExtFileInfo:public TQObject
{
Q_OBJECT
TQ_OBJECT
public:
- TQExtFileInfo() {};
- ~TQExtFileInfo() {};
+ QExtFileInfo() {};
+ ~QExtFileInfo() {};
/** create to ralative short name */
static KURL toRelative(const KURL& urlToConvert,const KURL& baseURL);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 14:52:16 +0000