summaryrefslogtreecommitdiffstats
path: root/kio/kfile
diff options
context:
space:
mode:
Diffstat (limited to 'kio/kfile')
-rw-r--r--kio/kfile/kdiroperator.cpp4
-rw-r--r--kio/kfile/kfileiconview.cpp2
-rw-r--r--kio/kfile/knotifydialog.h2
-rw-r--r--kio/kfile/kopenwith.cpp18
-rw-r--r--kio/kfile/kopenwith.h4
-rw-r--r--kio/kfile/kopenwith_p.h6
-rw-r--r--kio/kfile/kpropertiesdialog.cpp26
-rw-r--r--kio/kfile/kpropertiesdialog.h10
-rw-r--r--kio/kfile/tests/kcustommenueditortest.cpp2
-rw-r--r--kio/kfile/tests/kdirselectdialogtest.cpp2
-rw-r--r--kio/kfile/tests/kfiletreeviewtest.cpp2
-rw-r--r--kio/kfile/tests/kfstest.cpp2
-rw-r--r--kio/kfile/tests/kicondialogtest.cpp2
-rw-r--r--kio/kfile/tests/knotifytest.cpp2
-rw-r--r--kio/kfile/tests/kopenwithtest.cpp2
-rw-r--r--kio/kfile/tests/kurlrequestertest.cpp2
16 files changed, 44 insertions, 44 deletions
diff --git a/kio/kfile/kdiroperator.cpp b/kio/kfile/kdiroperator.cpp
index c5e339b1a..f9e2d237c 100644
--- a/kio/kfile/kdiroperator.cpp
+++ b/kio/kfile/kdiroperator.cpp
@@ -1383,11 +1383,11 @@ void KDirOperator::setupMenu(int whichActions)
if (whichActions & FileActions)
{
actionMenu->insert( mkdirAction );
- if (currUrl.isLocalFile() && !(KApplication::keyboardMouseState() & TQt::ShiftButton))
+ if (currUrl.isLocalFile() && !(TDEApplication::keyboardMouseState() & TQt::ShiftButton))
actionMenu->insert( myActionCollection->action( "trash" ) );
KConfig *globalconfig = KGlobal::config();
KConfigGroupSaver cs( globalconfig, TQString::fromLatin1("KDE") );
- if (!currUrl.isLocalFile() || (KApplication::keyboardMouseState() & TQt::ShiftButton) ||
+ if (!currUrl.isLocalFile() || (TDEApplication::keyboardMouseState() & TQt::ShiftButton) ||
globalconfig->readBoolEntry("ShowDeleteCommand", false))
actionMenu->insert( myActionCollection->action( "delete" ) );
actionMenu->insert( actionSeparator );
diff --git a/kio/kfile/kfileiconview.cpp b/kio/kfile/kfileiconview.cpp
index 86bd5eeb2..10b8285c1 100644
--- a/kio/kfile/kfileiconview.cpp
+++ b/kio/kfile/kfileiconview.cpp
@@ -362,7 +362,7 @@ void KFileIconView::slotActivate( TQIconViewItem *item )
void KFileIconView::selected( TQIconViewItem *item )
{
- if ( !item || (KApplication::keyboardMouseState() & (ShiftButton | ControlButton)) != 0 )
+ if ( !item || (TDEApplication::keyboardMouseState() & (ShiftButton | ControlButton)) != 0 )
return;
if ( KGlobalSettings::singleClick() ) {
diff --git a/kio/kfile/knotifydialog.h b/kio/kfile/knotifydialog.h
index 165df42f4..2adb2b15a 100644
--- a/kio/kfile/knotifydialog.h
+++ b/kio/kfile/knotifydialog.h
@@ -96,7 +96,7 @@ public:
* KNotifyDialog can handle events for multiple applications (i.e. eventsrc files).
* Successive calls with a different @p appName will add them.
* @param appName The application's name, i.e. the name passed to the
- * KApplication constructor or KAboutData.
+ * TDEApplication constructor or KAboutData.
* @see clearApplicationEvents()
*/
virtual void addApplicationEvents( const char *appName );
diff --git a/kio/kfile/kopenwith.cpp b/kio/kfile/kopenwith.cpp
index 8f498aa8d..c8623ced2 100644
--- a/kio/kfile/kopenwith.cpp
+++ b/kio/kfile/kopenwith.cpp
@@ -131,7 +131,7 @@ void KAppTreeListItem::activate()
void KAppTreeListItem::setOpen( bool o )
{
if( o && !parsed ) { // fill the children before opening
- ((KApplicationTree *) parent())->addDesktopGroup( path, this );
+ ((TDEApplicationTree *) parent())->addDesktopGroup( path, this );
parsed = true;
}
TQListViewItem::setOpen( o );
@@ -144,7 +144,7 @@ bool KAppTreeListItem::isDirectory()
// ----------------------------------------------------------------------
-KApplicationTree::KApplicationTree( TQWidget *parent )
+TDEApplicationTree::TDEApplicationTree( TQWidget *parent )
: KListView( parent ), currentitem(0)
{
addColumn( i18n("Known Applications") );
@@ -161,7 +161,7 @@ KApplicationTree::KApplicationTree( TQWidget *parent )
// ----------------------------------------------------------------------
-bool KApplicationTree::isDirSel()
+bool TDEApplicationTree::isDirSel()
{
if (!currentitem) return false; // if currentitem isn't set
return currentitem->isDirectory();
@@ -182,7 +182,7 @@ static TQPixmap appIcon(const TQString &iconName)
return normal;
}
-void KApplicationTree::addDesktopGroup( const TQString &relPath, KAppTreeListItem *item)
+void TDEApplicationTree::addDesktopGroup( const TQString &relPath, KAppTreeListItem *item)
{
KServiceGroup::Ptr root = KServiceGroup::group(relPath);
if (!root || !root->isValid()) return;
@@ -244,7 +244,7 @@ void KApplicationTree::addDesktopGroup( const TQString &relPath, KAppTreeListIte
// ----------------------------------------------------------------------
-void KApplicationTree::slotItemHighlighted(TQListViewItem* i)
+void TDEApplicationTree::slotItemHighlighted(TQListViewItem* i)
{
// i may be 0 (see documentation)
if(!i)
@@ -261,7 +261,7 @@ void KApplicationTree::slotItemHighlighted(TQListViewItem* i)
// ----------------------------------------------------------------------
-void KApplicationTree::slotSelectionChanged(TQListViewItem* i)
+void TDEApplicationTree::slotSelectionChanged(TQListViewItem* i)
{
// i may be 0 (see documentation)
if(!i)
@@ -277,7 +277,7 @@ void KApplicationTree::slotSelectionChanged(TQListViewItem* i)
// ----------------------------------------------------------------------
-void KApplicationTree::resizeEvent( TQResizeEvent * e)
+void TDEApplicationTree::resizeEvent( TQResizeEvent * e)
{
setColumnWidth(0, width()-TQApplication::style().pixelMetric(TQStyle::PM_ScrollBarExtent)
-2*TQApplication::style().pixelMetric(TQStyle::PM_DefaultFrameWidth));
@@ -285,7 +285,7 @@ void KApplicationTree::resizeEvent( TQResizeEvent * e)
}
// Prune empty directories from the tree
-void KApplicationTree::cleanupTree()
+void TDEApplicationTree::cleanupTree()
{
TQListViewItem *item=firstChild();
while(item!=0)
@@ -456,7 +456,7 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value )
connect ( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotOK()) );
connect ( edit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotTextChanged()) );
- m_pTree = new KApplicationTree( this );
+ m_pTree = new TDEApplicationTree( this );
topLayout->addWidget(m_pTree);
connect( m_pTree, TQT_SIGNAL( selected( const TQString&, const TQString& ) ),
diff --git a/kio/kfile/kopenwith.h b/kio/kfile/kopenwith.h
index 3dceb10bc..a6c570172 100644
--- a/kio/kfile/kopenwith.h
+++ b/kio/kfile/kopenwith.h
@@ -26,7 +26,7 @@
#include <krun.h>
#include <kservice.h>
-class KApplicationTree;
+class TDEApplicationTree;
class KURLRequester;
class TQWidget;
@@ -161,7 +161,7 @@ protected:
KURLRequester * edit;
TQString m_command;
- KApplicationTree* m_pTree;
+ TDEApplicationTree* m_pTree;
TQLabel *label;
TQString qName, qServiceType;
diff --git a/kio/kfile/kopenwith_p.h b/kio/kfile/kopenwith_p.h
index f395d94bd..8231da27d 100644
--- a/kio/kfile/kopenwith_p.h
+++ b/kio/kfile/kopenwith_p.h
@@ -61,7 +61,7 @@ protected:
virtual void activate();
virtual void setOpen( bool o );
- friend class KApplicationTree;
+ friend class TDEApplicationTree;
};
/* ------------------------------------------------------------------------- */
@@ -69,11 +69,11 @@ protected:
/**
* @internal
*/
-class KApplicationTree : public KListView
+class TDEApplicationTree : public KListView
{
Q_OBJECT
public:
- KApplicationTree( TQWidget *parent );
+ TDEApplicationTree( TQWidget *parent );
/**
* Add a group of .desktop/.kdelnk entries
diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp
index 6bfe09e8d..a1076c134 100644
--- a/kio/kfile/kpropertiesdialog.cpp
+++ b/kio/kfile/kpropertiesdialog.cpp
@@ -3887,14 +3887,14 @@ void KExecPropsPlugin::slotBrowseExec()
execEdit->setText( path );
}
-class KApplicationPropsPlugin::KApplicationPropsPluginPrivate
+class TDEApplicationPropsPlugin::TDEApplicationPropsPluginPrivate
{
public:
- KApplicationPropsPluginPrivate()
+ TDEApplicationPropsPluginPrivate()
{
m_kdesktopMode = TQCString(tqApp->name()) == "kdesktop"; // nasty heh?
}
- ~KApplicationPropsPluginPrivate()
+ ~TDEApplicationPropsPluginPrivate()
{
}
@@ -3902,10 +3902,10 @@ public:
bool m_kdesktopMode;
};
-KApplicationPropsPlugin::KApplicationPropsPlugin( KPropertiesDialog *_props )
+TDEApplicationPropsPlugin::TDEApplicationPropsPlugin( KPropertiesDialog *_props )
: KPropsDlgPlugin( _props )
{
- d = new KApplicationPropsPluginPrivate;
+ d = new TDEApplicationPropsPluginPrivate;
d->m_frame = properties->addPage(i18n("&Application"));
TQVBoxLayout *toplayout = new TQVBoxLayout( d->m_frame, 0, KDialog::spacingHint());
@@ -4043,23 +4043,23 @@ KApplicationPropsPlugin::KApplicationPropsPlugin( KPropertiesDialog *_props )
this, TQT_SIGNAL( changed() ) );
}
-KApplicationPropsPlugin::~KApplicationPropsPlugin()
+TDEApplicationPropsPlugin::~TDEApplicationPropsPlugin()
{
delete d;
}
-// TQString KApplicationPropsPlugin::tabName () const
+// TQString TDEApplicationPropsPlugin::tabName () const
// {
// return i18n ("&Application");
// }
-void KApplicationPropsPlugin::updateButton()
+void TDEApplicationPropsPlugin::updateButton()
{
addExtensionButton->setEnabled(availableExtensionsList->currentItem()>-1);
delExtensionButton->setEnabled(extensionsList->currentItem()>-1);
}
-void KApplicationPropsPlugin::addMimeType( const TQString & name )
+void TDEApplicationPropsPlugin::addMimeType( const TQString & name )
{
// Add a mimetype to the list of available mime types if not in the extensionsList
@@ -4076,13 +4076,13 @@ void KApplicationPropsPlugin::addMimeType( const TQString & name )
}
}
-bool KApplicationPropsPlugin::supports( KFileItemList _items )
+bool TDEApplicationPropsPlugin::supports( KFileItemList _items )
{
// same constraints as KExecPropsPlugin : desktop file with Type = Application
return KExecPropsPlugin::supports( _items );
}
-void KApplicationPropsPlugin::applyChanges()
+void TDEApplicationPropsPlugin::applyChanges()
{
TQString path = properties->kurl().path();
@@ -4121,7 +4121,7 @@ void KApplicationPropsPlugin::applyChanges()
config.sync();
}
-void KApplicationPropsPlugin::slotAddExtension()
+void TDEApplicationPropsPlugin::slotAddExtension()
{
TQListBoxItem *item = availableExtensionsList->firstItem();
TQListBoxItem *nextItem;
@@ -4143,7 +4143,7 @@ void KApplicationPropsPlugin::slotAddExtension()
updateButton();
}
-void KApplicationPropsPlugin::slotDelExtension()
+void TDEApplicationPropsPlugin::slotDelExtension()
{
TQListBoxItem *item = extensionsList->firstItem();
TQListBoxItem *nextItem;
diff --git a/kio/kfile/kpropertiesdialog.h b/kio/kfile/kpropertiesdialog.h
index 91439f8cc..d6a8223dd 100644
--- a/kio/kfile/kpropertiesdialog.h
+++ b/kio/kfile/kpropertiesdialog.h
@@ -878,15 +878,15 @@ private:
* @deprecated replaced with KDesktopPropsPlugin
*/
/// Remove in KDE4
-class KIO_EXPORT_DEPRECATED KApplicationPropsPlugin : public KPropsDlgPlugin
+class KIO_EXPORT_DEPRECATED TDEApplicationPropsPlugin : public KPropsDlgPlugin
{
Q_OBJECT
public:
/**
* Constructor
*/
- KApplicationPropsPlugin( KPropertiesDialog *_props );
- virtual ~KApplicationPropsPlugin();
+ TDEApplicationPropsPlugin( KPropertiesDialog *_props );
+ virtual ~TDEApplicationPropsPlugin();
virtual void applyChanges();
@@ -910,8 +910,8 @@ private:
TQPushButton *addExtensionButton;
TQPushButton *delExtensionButton;
- class KApplicationPropsPluginPrivate;
- KApplicationPropsPluginPrivate *d;
+ class TDEApplicationPropsPluginPrivate;
+ TDEApplicationPropsPluginPrivate *d;
};
#endif
diff --git a/kio/kfile/tests/kcustommenueditortest.cpp b/kio/kfile/tests/kcustommenueditortest.cpp
index 859e75452..9e00687ac 100644
--- a/kio/kfile/tests/kcustommenueditortest.cpp
+++ b/kio/kfile/tests/kcustommenueditortest.cpp
@@ -6,7 +6,7 @@
int main(int argc, char** argv)
{
KLocale::setMainCatalogue("tdelibs");
- KApplication app(argc, argv, "KCustomMenuEditorTest");
+ TDEApplication app(argc, argv, "KCustomMenuEditorTest");
KCustomMenuEditor editor(0);
KConfig *cfg = new KConfig("kdesktop_custom_menu2");
editor.load(cfg);
diff --git a/kio/kfile/tests/kdirselectdialogtest.cpp b/kio/kfile/tests/kdirselectdialogtest.cpp
index 47fcd02ca..3d15c47d0 100644
--- a/kio/kfile/tests/kdirselectdialogtest.cpp
+++ b/kio/kfile/tests/kdirselectdialogtest.cpp
@@ -5,7 +5,7 @@
int main( int argc, char **argv )
{
- KApplication app(argc, argv, "kdirselectdialogtest");
+ TDEApplication app(argc, argv, "kdirselectdialogtest");
KURL u = KDirSelectDialog::selectDirectory( (argc >= 1) ? argv[1] : TQString::null );
if ( u.isValid() )
diff --git a/kio/kfile/tests/kfiletreeviewtest.cpp b/kio/kfile/tests/kfiletreeviewtest.cpp
index 5c520dd5d..e131bda3a 100644
--- a/kio/kfile/tests/kfiletreeviewtest.cpp
+++ b/kio/kfile/tests/kfiletreeviewtest.cpp
@@ -134,7 +134,7 @@ void testFrame::slotSetChildCount( KFileTreeViewItem *item, int c )
int main(int argc, char **argv)
{
- KApplication a(argc, argv, "kfiletreeviewtest");
+ TDEApplication a(argc, argv, "kfiletreeviewtest");
TQString name1;
TQStringList names;
diff --git a/kio/kfile/tests/kfstest.cpp b/kio/kfile/tests/kfstest.cpp
index db3f46e28..f85995a61 100644
--- a/kio/kfile/tests/kfstest.cpp
+++ b/kio/kfile/tests/kfstest.cpp
@@ -44,7 +44,7 @@
int main(int argc, char **argv)
{
- KApplication a(argc, argv, "kfstest");
+ TDEApplication a(argc, argv, "kfstest");
TQString name1;
TQStringList names;
diff --git a/kio/kfile/tests/kicondialogtest.cpp b/kio/kfile/tests/kicondialogtest.cpp
index 23301b752..b2c56e159 100644
--- a/kio/kfile/tests/kicondialogtest.cpp
+++ b/kio/kfile/tests/kicondialogtest.cpp
@@ -3,7 +3,7 @@
int main( int argc, char **argv )
{
- KApplication app( argc, argv, "kicondialogtest" );
+ TDEApplication app( argc, argv, "kicondialogtest" );
// KIconDialog::getIcon();
diff --git a/kio/kfile/tests/knotifytest.cpp b/kio/kfile/tests/knotifytest.cpp
index f6e93fa99..0493b59b4 100644
--- a/kio/kfile/tests/knotifytest.cpp
+++ b/kio/kfile/tests/knotifytest.cpp
@@ -3,7 +3,7 @@
int main( int argc, char **argv )
{
- KApplication app( argc, argv, "knotifytest" );
+ TDEApplication app( argc, argv, "knotifytest" );
KNotifyDialog *dlg = new KNotifyDialog();
dlg->addApplicationEvents( "twin" );
return dlg->exec();
diff --git a/kio/kfile/tests/kopenwithtest.cpp b/kio/kfile/tests/kopenwithtest.cpp
index ea348a94c..f78b1830b 100644
--- a/kio/kfile/tests/kopenwithtest.cpp
+++ b/kio/kfile/tests/kopenwithtest.cpp
@@ -28,7 +28,7 @@
int main(int argc, char **argv)
{
- KApplication app(argc, argv, "kopenwithtest");
+ TDEApplication app(argc, argv, "kopenwithtest");
KURL::List list;
list += KURL("file:///tmp/testfile.txt");
diff --git a/kio/kfile/tests/kurlrequestertest.cpp b/kio/kfile/tests/kurlrequestertest.cpp
index 99af39814..0e4851cfb 100644
--- a/kio/kfile/tests/kurlrequestertest.cpp
+++ b/kio/kfile/tests/kurlrequestertest.cpp
@@ -5,7 +5,7 @@
int main( int argc, char **argv )
{
- KApplication app( argc, argv, "kurlrequestertest" );
+ TDEApplication app( argc, argv, "kurlrequestertest" );
KURL url = KURLRequesterDlg::getURL( "ftp://ftp.kde.org" );
tqDebug( "Selected url: %s", url.url().latin1());
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-26 19:40:44 +0000