summaryrefslogtreecommitdiffstats
path: root/libkonq/knewmenu.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'libkonq/knewmenu.cpp')
-rw-r--r--libkonq/knewmenu.cpp60
1 files changed, 30 insertions, 30 deletions
diff --git a/libkonq/knewmenu.cpp b/libkonq/knewmenu.cpp
index 621b1f614..1051ba7eb 100644
--- a/libkonq/knewmenu.cpp
+++ b/libkonq/knewmenu.cpp
@@ -20,13 +20,13 @@
#include <tqdir.h>
#include <kdebug.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
#include <kdirwatch.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kinputdialog.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kprotocolinfo.h>
#include <tdepopupmenu.h>
#include <krun.h>
@@ -145,8 +145,8 @@ void KNewMenu::parseFiles()
TQString templatePath;
// If a desktop file, then read the name from it.
// Otherwise (or if no name in it?) use file name
- if ( KDesktopFile::isDesktopFile( filePath ) ) {
- KSimpleConfig config( filePath, true );
+ if ( TDEDesktopFile::isDesktopFile( filePath ) ) {
+ TDESimpleConfig config( filePath, true );
config.setDesktopGroup();
text = config.readEntry("Name");
(*templ).icon = config.readEntry("Icon");
@@ -238,7 +238,7 @@ void KNewMenu::fillMenu()
// The best way to identify the "Create Directory", "Link to Location", "Link to Application" was the template
if ( (*templ).templatePath.endsWith( "emptydir" ) )
{
- TDEAction * act = new TDEAction( (*templ).text, (*templ).icon, 0, this, TQT_SLOT( slotNewDir() ),
+ TDEAction * act = new TDEAction( (*templ).text, (*templ).icon, 0, this, TQ_SLOT( slotNewDir() ),
d->m_actionCollection, TQCString().sprintf("newmenu%d", i ) );
act->setGroup( "KNewMenu" );
act->plug( popupMenu() );
@@ -248,7 +248,7 @@ void KNewMenu::fillMenu()
}
else
{
- TDEAction * act = new TDEAction( (*templ).text, (*templ).icon, 0, this, TQT_SLOT( slotNewFile() ),
+ TDEAction * act = new TDEAction( (*templ).text, (*templ).icon, 0, this, TQ_SLOT( slotNewFile() ),
d->m_actionCollection, TQCString().sprintf("newmenu%d", i ) );
act->setGroup( "KNewMenu" );
@@ -260,9 +260,9 @@ void KNewMenu::fillMenu()
{
linkApp = act;
}
- else if ( KDesktopFile::isDesktopFile( entry.templatePath ) )
+ else if ( TDEDesktopFile::isDesktopFile( entry.templatePath ) )
{
- KDesktopFile df( entry.templatePath );
+ TDEDesktopFile df( entry.templatePath );
if(df.readType() == "FSDevice")
act->plug( d->m_menuDev->popupMenu() );
else
@@ -302,12 +302,12 @@ void KNewMenu::slotFillTemplates()
//kdDebug(1203) << "Templates resource dir: " << *it << endl;
s_pDirWatch->addDir( *it );
}
- connect ( s_pDirWatch, TQT_SIGNAL( dirty( const TQString & ) ),
- this, TQT_SLOT ( slotFillTemplates() ) );
- connect ( s_pDirWatch, TQT_SIGNAL( created( const TQString & ) ),
- this, TQT_SLOT ( slotFillTemplates() ) );
- connect ( s_pDirWatch, TQT_SIGNAL( deleted( const TQString & ) ),
- this, TQT_SLOT ( slotFillTemplates() ) );
+ connect ( s_pDirWatch, TQ_SIGNAL( dirty( const TQString & ) ),
+ this, TQ_SLOT ( slotFillTemplates() ) );
+ connect ( s_pDirWatch, TQ_SIGNAL( created( const TQString & ) ),
+ this, TQ_SLOT ( slotFillTemplates() ) );
+ connect ( s_pDirWatch, TQ_SIGNAL( deleted( const TQString & ) ),
+ this, TQ_SLOT ( slotFillTemplates() ) );
// Ok, this doesn't cope with new dirs in TDEDIRS, but that's another story
}
s_templatesVersion++;
@@ -333,7 +333,7 @@ void KNewMenu::slotFillTemplates()
s_templatesList->prepend( e );
else
{
- KSimpleConfig config( *it, true );
+ TDESimpleConfig config( *it, true );
config.setDesktopGroup();
// tricky solution to ensure that TextFile is at the beginning
@@ -368,11 +368,11 @@ void KNewMenu::slotNewDir()
void KNewMenu::slotNewFile()
{
- int id = TQString( TQT_TQOBJECT_CONST(sender())->name() + 7 ).toInt(); // skip "newmenu"
+ int id = TQString( sender()->name() + 7 ).toInt(); // skip "newmenu"
if (id == 0)
{
// run the command for the templates
- KRun::runCommand(TQString(TQT_TQOBJECT_CONST(sender())->name()));
+ KRun::runCommand(TQString(sender()->name()));
return;
}
@@ -388,9 +388,9 @@ void KNewMenu::slotNewFile()
}
m_isURLDesktopFile = false;
TQString name;
- if ( KDesktopFile::isDesktopFile( entry.templatePath ) )
+ if ( TDEDesktopFile::isDesktopFile( entry.templatePath ) )
{
- KDesktopFile df( entry.templatePath );
+ TDEDesktopFile df( entry.templatePath );
//kdDebug(1203) << df.readType() << endl;
if ( df.readType() == "Link" )
{
@@ -468,11 +468,11 @@ void KNewMenu::slotNewFile()
//kdDebug(1203) << "KNewMenu : TDEIO::copyAs( " << uSrc.url() << ", " << dest.url() << ")" << endl;
TDEIO::CopyJob * job = TDEIO::copyAs( uSrc, dest );
job->setDefaultPermissions( true );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotResult( TDEIO::Job * ) ) );
if ( m_isURLDesktopFile )
- connect( job, TQT_SIGNAL( renamed( TDEIO::Job *, const KURL&, const KURL& ) ),
- TQT_SLOT( slotRenamed( TDEIO::Job *, const KURL&, const KURL& ) ) );
+ connect( job, TQ_SIGNAL( renamed( TDEIO::Job *, const KURL&, const KURL& ) ),
+ TQ_SLOT( slotRenamed( TDEIO::Job *, const KURL&, const KURL& ) ) );
KURL::List lst;
lst.append( uSrc );
(void)new KonqCommandRecorder( KonqCommand::COPY, lst, dest, job );
@@ -505,7 +505,7 @@ void KNewMenu::slotResult( TDEIO::Job * job )
// destURL is the original destination for the new file.
// But in case of a renaming (due to a conflict), the real path is in m_destPath
kdDebug(1203) << " destURL=" << destURL.path() << " " << " d->m_destPath=" << d->m_destPath << endl;
- KDesktopFile df( d->m_destPath );
+ TDEDesktopFile df( d->m_destPath );
df.writeEntry( "Icon", KProtocolInfo::icon( KURL(m_linkURL).protocol() ) );
df.writePathEntry( "URL", m_linkURL );
df.sync();
@@ -549,8 +549,8 @@ void KURLDesktopFileDlg::initDialog( const TQString& textFileName, const TQStrin
label->setBuddy(m_leFileName); // please "scheck" style
m_leFileName->setText( defaultName );
m_leFileName->setSelection(0, m_leFileName->text().length()); // autoselect
- connect( m_leFileName, TQT_SIGNAL(textChanged(const TQString&)),
- TQT_SLOT(slotNameTextChanged(const TQString&)) );
+ connect( m_leFileName, TQ_SIGNAL(textChanged(const TQString&)),
+ TQ_SLOT(slotNameTextChanged(const TQString&)) );
// Second line: url
TQHBox * urlBox = new TQHBox( plainPage() );
@@ -560,13 +560,13 @@ void KURLDesktopFileDlg::initDialog( const TQString& textFileName, const TQStrin
m_urlRequester->setMode( KFile::File | KFile::Directory );
m_urlRequester->setMinimumWidth( m_urlRequester->sizeHint().width() * 3 );
- connect( m_urlRequester->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)),
- TQT_SLOT(slotURLTextChanged(const TQString&)) );
+ connect( m_urlRequester->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)),
+ TQ_SLOT(slotURLTextChanged(const TQString&)) );
label->setBuddy(m_urlRequester); // please "scheck" style
m_urlRequester->setFocus();
enableButtonOK( !defaultName.isEmpty() && !defaultUrl.isEmpty() );
- connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotClear()) );
+ connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotClear()) );
m_fileNameEdited = false;
}