diff options
Diffstat (limited to 'lib')
34 files changed, 81 insertions, 81 deletions
diff --git a/lib/kformula/main.cc b/lib/kformula/main.cc index 966404edf..19b534a07 100644 --- a/lib/kformula/main.cc +++ b/lib/kformula/main.cc @@ -236,8 +236,8 @@ static const KCmdLineOptions options[]= { int main(int argc, char** argv) { - KAboutData aboutData("math test", "KFormula test", - "0.01", "test", KAboutData::License_GPL, + TDEAboutData aboutData("math test", "KFormula test", + "0.01", "test", TDEAboutData::License_GPL, "(c) 2003, Ulrich Kuettler"); aboutData.addAuthor("Ulrich Kuettler",0, "ulrich.kuettler@gmx.de"); diff --git a/lib/kofficecore/DESIGN b/lib/kofficecore/DESIGN index c191128bb..bc5d16cd4 100644 --- a/lib/kofficecore/DESIGN +++ b/lib/kofficecore/DESIGN @@ -5,17 +5,17 @@ | from the answers given by David Faure <faure@kde.org> ------------------------------------------------------------------------- -Q: Where is the pointer to the application's instance of KAboutData +Q: Where is the pointer to the application's instance of TDEAboutData data stored? A: In a static member of the TDECmdLineArgs class. -Q: One of the arguments to KAboutData's constructor is the program +Q: One of the arguments to TDEAboutData's constructor is the program name. Will this be used later to run the program? -A: No (by the time the KAboutData's constructor is called, the program +A: No (by the time the TDEAboutData's constructor is called, the program is already running). The program name is in fact the "instance name", which is used to locate the application's own data (/share/apps/<application name>/...) and many other things. diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp index 66828e993..1e204af7c 100644 --- a/lib/kofficecore/KoDetailsPane.cpp +++ b/lib/kofficecore/KoDetailsPane.cpp @@ -75,13 +75,13 @@ class KoTemplatesPanePrivate { } - KInstance* m_instance; + TDEInstance* m_instance; bool m_selected; TQString m_alwaysUseTemplate; }; -KoTemplatesPane::KoTemplatesPane(TQWidget* parent, KInstance* instance, +KoTemplatesPane::KoTemplatesPane(TQWidget* parent, TDEInstance* instance, KoTemplateGroup *group, KoTemplate* /*defaultTemplate*/) : KoDetailsPaneBase(parent, "TemplatesPane") { @@ -265,10 +265,10 @@ class KoRecentDocumentsPanePrivate } KIO::PreviewJob* m_previewJob; - KInstance* m_instance; + TDEInstance* m_instance; }; -KoRecentDocumentsPane::KoRecentDocumentsPane(TQWidget* parent, KInstance* instance) +KoRecentDocumentsPane::KoRecentDocumentsPane(TQWidget* parent, TDEInstance* instance) : KoDetailsPaneBase(parent, "RecentDocsPane") { d = new KoRecentDocumentsPanePrivate; diff --git a/lib/kofficecore/KoDetailsPane.h b/lib/kofficecore/KoDetailsPane.h index 9f1cf7ba7..86190edea 100644 --- a/lib/kofficecore/KoDetailsPane.h +++ b/lib/kofficecore/KoDetailsPane.h @@ -25,7 +25,7 @@ class KoTemplateGroup; class KoTemplate; -class KInstance; +class TDEInstance; class TQListViewItem; class KoRecentDocumentsPanePrivate; class KoRichTextListItemPrivate; @@ -56,7 +56,7 @@ class KoTemplatesPane : public KoDetailsPaneBase * @param defaultTemplate pointer to the default template. Used to select a * template when none has been selected before. */ - KoTemplatesPane(TQWidget* parent, KInstance* instance, + KoTemplatesPane(TQWidget* parent, TDEInstance* instance, KoTemplateGroup* group, KoTemplate* defaultTemplate); ~KoTemplatesPane(); @@ -104,7 +104,7 @@ class KoRecentDocumentsPane : public KoDetailsPaneBase * @param parent the parent widget * @param instance the instance object for the app */ - KoRecentDocumentsPane(TQWidget* parent, KInstance* instance); + KoRecentDocumentsPane(TQWidget* parent, TDEInstance* instance); ~KoRecentDocumentsPane(); virtual bool eventFilter(TQObject* watched, TQEvent* e); diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index 6abf80837..7eebcbca3 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -2217,7 +2217,7 @@ TQCString KoDocument::nativeOasisMimeType() const //static -KService::Ptr KoDocument::readNativeService( KInstance *instance ) +KService::Ptr KoDocument::readNativeService( TDEInstance *instance ) { TQString instname = instance ? instance->instanceName() : kapp->instanceName(); @@ -2241,7 +2241,7 @@ KService::Ptr KoDocument::readNativeService( KInstance *instance ) return service; } -TQCString KoDocument::readNativeFormatMimeType( KInstance *instance ) //static +TQCString KoDocument::readNativeFormatMimeType( TDEInstance *instance ) //static { KService::Ptr service = readNativeService( instance ); if ( !service ) @@ -2262,7 +2262,7 @@ TQCString KoDocument::readNativeFormatMimeType( KInstance *instance ) //static return service->property( "X-TDE-NativeMimeType" ).toString().latin1(); } -TQStringList KoDocument::readExtraNativeMimeTypes( KInstance *instance ) //static +TQStringList KoDocument::readExtraNativeMimeTypes( TDEInstance *instance ) //static { KService::Ptr service = readNativeService( instance ); if ( !service ) @@ -2600,7 +2600,7 @@ void KoDocument::startCustomDocument() { deleteOpenPane(); } -KoOpenPane* KoDocument::createOpenPane( TQWidget* parent, KInstance* instance, +KoOpenPane* KoDocument::createOpenPane( TQWidget* parent, TDEInstance* instance, const TQString& templateType ) { KoOpenPane* openPane = new KoOpenPane( parent, instance, templateType ); diff --git a/lib/kofficecore/KoDocument.h b/lib/kofficecore/KoDocument.h index 63fd47c96..30b9ad977 100644 --- a/lib/kofficecore/KoDocument.h +++ b/lib/kofficecore/KoDocument.h @@ -188,7 +188,7 @@ public: * @see KService * @see KDesktopFile */ - static TQCString readNativeFormatMimeType( KInstance *instance = 0 ); + static TQCString readNativeFormatMimeType( TDEInstance *instance = 0 ); /** * Used by KoMainWindow, when no document exists yet. @@ -200,14 +200,14 @@ public: * @see KService * @see KDesktopFile */ - static TQStringList readExtraNativeMimeTypes( KInstance *instance = 0 ); + static TQStringList readExtraNativeMimeTypes( TDEInstance *instance = 0 ); /** * With the help of @p instance or TDEApplication::instance() this * method figures out which .desktop file matches this application, * and returns the KService instance for it. */ - static KService::Ptr readNativeService( KInstance *instance = 0 ); + static KService::Ptr readNativeService( TDEInstance *instance = 0 ); /** * setup the XML reader, so that we don't have to duplicate the code. @@ -1123,11 +1123,11 @@ protected: /** * Creates the open widget showed at application start up. * @param parent the parent widget - * @param instance the KInstance to be used for KConfig data + * @param instance the TDEInstance to be used for KConfig data * @param templateType the template-type (group) that should be selected on creation. * @since 1.5 */ - KoOpenPane* createOpenPane( TQWidget* parent, KInstance* instance, + KoOpenPane* createOpenPane( TQWidget* parent, TDEInstance* instance, const TQString& templateType = TQString()); private slots: diff --git a/lib/kofficecore/KoFactory.h b/lib/kofficecore/KoFactory.h index 9435a79e4..db9e12ad4 100644 --- a/lib/kofficecore/KoFactory.h +++ b/lib/kofficecore/KoFactory.h @@ -22,7 +22,7 @@ #include <kparts/factory.h> #include <koffice_export.h> -class KInstance; +class TDEInstance; class KOFFICECORE_EXPORT KoFactory : public KParts::Factory { diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp index 19fea8238..2487993aa 100644 --- a/lib/kofficecore/KoMainWindow.cpp +++ b/lib/kofficecore/KoMainWindow.cpp @@ -183,7 +183,7 @@ public: KSharedPtr<KoSpeaker> m_koSpeaker; }; -KoMainWindow::KoMainWindow( KInstance *instance, const char* name ) +KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name ) : KParts::MainWindow( name ) { setStandardToolBarMenuEnabled(true); // should there be a check for >= 3.1 ? diff --git a/lib/kofficecore/KoMainWindow.h b/lib/kofficecore/KoMainWindow.h index 433c93d44..293d7722c 100644 --- a/lib/kofficecore/KoMainWindow.h +++ b/lib/kofficecore/KoMainWindow.h @@ -59,7 +59,7 @@ public: * * Initializes a KOffice main window (with its basic GUI etc.). */ - KoMainWindow( KInstance *instance, const char *_name = 0 ); + KoMainWindow( TDEInstance *instance, const char *_name = 0 ); /** * Destructor. diff --git a/lib/kofficecore/KoOpenPane.cpp b/lib/kofficecore/KoOpenPane.cpp index 83978239f..1079d5899 100644 --- a/lib/kofficecore/KoOpenPane.cpp +++ b/lib/kofficecore/KoOpenPane.cpp @@ -91,10 +91,10 @@ class KoOpenPanePrivate { } - KInstance* m_instance; + TDEInstance* m_instance; }; -KoOpenPane::KoOpenPane(TQWidget *parent, KInstance* instance, const TQString& templateType) +KoOpenPane::KoOpenPane(TQWidget *parent, TDEInstance* instance, const TQString& templateType) : KoOpenPaneBase(parent, "OpenPane") { d = new KoOpenPanePrivate; diff --git a/lib/kofficecore/KoOpenPane.h b/lib/kofficecore/KoOpenPane.h index ad6a8db5b..d9abf832f 100644 --- a/lib/kofficecore/KoOpenPane.h +++ b/lib/kofficecore/KoOpenPane.h @@ -27,7 +27,7 @@ class KoCustomDocumentCreator; class KConfig; class KoTemplateGroup; class KoOpenPanePrivate; -class KInstance; +class TDEInstance; class TQPixmap; class KListViewItem; class KoTemplatesPane; @@ -42,10 +42,10 @@ class KoOpenPane : public KoOpenPaneBase /** * Constructor * @param parent the parent widget - * @param instance the KInstance to be used for KConfig data + * @param instance the TDEInstance to be used for KConfig data * @param templateType the template-type (group) that should be selected on creation. */ - KoOpenPane(TQWidget *parent, KInstance* instance, const TQString& templateType = TQString()); + KoOpenPane(TQWidget *parent, TDEInstance* instance, const TQString& templateType = TQString()); virtual ~KoOpenPane(); TQListViewItem* addPane(const TQString& title, const TQString& icon, TQWidget* widget, int sortWeight); diff --git a/lib/kofficecore/KoTemplates.cpp b/lib/kofficecore/KoTemplates.cpp index a86d799a2..e020213ef 100644 --- a/lib/kofficecore/KoTemplates.cpp +++ b/lib/kofficecore/KoTemplates.cpp @@ -45,7 +45,7 @@ KoTemplate::KoTemplate(const TQString &name, const TQString &description, const { } -const TQPixmap &KoTemplate::loadPicture( KInstance* instance ) { +const TQPixmap &KoTemplate::loadPicture( TDEInstance* instance ) { if(m_cached) return m_pixmap; @@ -130,7 +130,7 @@ KoTemplate *KoTemplateGroup::find(const TQString &name) const { KoTemplateTree::KoTemplateTree(const TQCString &templateType, - KInstance *instance, bool readTree) : + TDEInstance *instance, bool readTree) : m_templateType(templateType), m_instance(instance), m_defaultGroup(0L), m_defaultTemplate(0L) { diff --git a/lib/kofficecore/KoTemplates.h b/lib/kofficecore/KoTemplates.h index d65fab446..481b9a94c 100644 --- a/lib/kofficecore/KoTemplates.h +++ b/lib/kofficecore/KoTemplates.h @@ -26,7 +26,7 @@ #include <tqpixmap.h> #include <koffice_export.h> -class KInstance; +class TDEInstance; /** @internal */ class KOFFICECORE_EXPORT KoTemplate { @@ -46,7 +46,7 @@ public: TQString file() const { return m_file; } TQString picture() const { return m_picture; } TQString fileName() const { return m_fileName; } - const TQPixmap &loadPicture( KInstance* instance ); + const TQPixmap &loadPicture( TDEInstance* instance ); bool isHidden() const { return m_hidden; } void setHidden(bool hidden=true) { m_hidden=hidden; m_touched=true; } @@ -108,12 +108,12 @@ private: class KoTemplateTree { public: - KoTemplateTree(const TQCString &templateType, KInstance *instance, + KoTemplateTree(const TQCString &templateType, TDEInstance *instance, bool readTree=false); ~KoTemplateTree() {} TQCString templateType() const { return m_templateType; } - KInstance *instance() const { return m_instance; } + TDEInstance *instance() const { return m_instance; } void readTemplateTree(); void writeTemplateTree(); @@ -136,7 +136,7 @@ private: const TQString &localDir); TQCString m_templateType; - KInstance *m_instance; + TDEInstance *m_instance; TQPtrList<KoTemplateGroup> m_groups; KoTemplateGroup *m_defaultGroup; KoTemplate *m_defaultTemplate; diff --git a/lib/kofficecore/KoView.h b/lib/kofficecore/KoView.h index db8e1fc6a..549296da1 100644 --- a/lib/kofficecore/KoView.h +++ b/lib/kofficecore/KoView.h @@ -37,7 +37,7 @@ class KoViewPrivate; class KoViewChild; class KoFrame; class KStatusBar; -class KInstance; +class TDEInstance; class KPrinter; class KoDocumentChild; class DCOPObject; diff --git a/lib/kofficecore/tests/filter_graph.cpp b/lib/kofficecore/tests/filter_graph.cpp index cffc4c54b..8ef386cb1 100644 --- a/lib/kofficecore/tests/filter_graph.cpp +++ b/lib/kofficecore/tests/filter_graph.cpp @@ -25,7 +25,7 @@ int main( int /*argc*/, char ** /*argv*/ ) { - KInstance instance( "filter_graph" ); // we need an instance when using the trader + TDEInstance instance( "filter_graph" ); // we need an instance when using the trader TQCString output = "digraph filters {\n"; diff --git a/lib/kofficecore/tests/filterchain_test.cpp b/lib/kofficecore/tests/filterchain_test.cpp index 05592b92e..27594d294 100644 --- a/lib/kofficecore/tests/filterchain_test.cpp +++ b/lib/kofficecore/tests/filterchain_test.cpp @@ -24,7 +24,7 @@ int main( int /*argc*/, char ** /*argv*/ ) { - KInstance instance( "filterchain_test" ); // we need an instance when using the trader + TDEInstance instance( "filterchain_test" ); // we need an instance when using the trader KOffice::Graph g( "application/x-kspread" ); g.dump(); g.setSourceMimeType( "application/x-kword" ); diff --git a/lib/kofficeui/KoSelectAction.cpp b/lib/kofficeui/KoSelectAction.cpp index 2742ff112..4bda88212 100644 --- a/lib/kofficeui/KoSelectAction.cpp +++ b/lib/kofficeui/KoSelectAction.cpp @@ -120,7 +120,7 @@ int KoSelectAction::plug(TQWidget* widget, int index) TQT_SLOT( slotActivated() ), isEnabled(), plainText(), index ); } else { - KInstance *instance; + TDEInstance *instance; if ( m_parentCollection ) { instance = m_parentCollection->instance(); diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp index af79486d8..d904fac03 100644 --- a/lib/kofficeui/KoTemplateChooseDia.cpp +++ b/lib/kofficeui/KoTemplateChooseDia.cpp @@ -119,7 +119,7 @@ private: class KoTemplateChooseDiaPrivate { public: - KoTemplateChooseDiaPrivate(const TQCString& templateType, KInstance* instance, + KoTemplateChooseDiaPrivate(const TQCString& templateType, TDEInstance* instance, const TQCString &format, const TQString &nativeName, const TQStringList& extraNativeMimeTypes, @@ -136,7 +136,7 @@ class KoTemplateChooseDiaPrivate { ~KoTemplateChooseDiaPrivate() {} TQCString m_templateType; - KInstance* m_instance; + TDEInstance* m_instance; TQCString m_format; TQString m_nativeName; TQStringList m_extraNativeMimeTypes; @@ -178,7 +178,7 @@ class KoTemplateChooseDiaPrivate { /******************************************************************/ /*================================================================*/ -KoTemplateChooseDia::KoTemplateChooseDia(TQWidget *parent, const char *name, KInstance* instance, +KoTemplateChooseDia::KoTemplateChooseDia(TQWidget *parent, const char *name, TDEInstance* instance, const TQCString &format, const TQString &nativeName, const TQStringList &extraNativeMimeTypes, @@ -227,7 +227,7 @@ static bool cancelQuits() { return onlyDoc && onlyMainWindow && kapp->instanceName() != "koshell"; // hack for koshell } -KoTemplateChooseDia::ReturnType KoTemplateChooseDia::choose(KInstance* instance, TQString &file, +KoTemplateChooseDia::ReturnType KoTemplateChooseDia::choose(TDEInstance* instance, TQString &file, const KoTemplateChooseDia::DialogType &dialogType, const TQCString& templateType, TQWidget* parent) @@ -241,7 +241,7 @@ KoTemplateChooseDia::ReturnType KoTemplateChooseDia::choose(KInstance* instance, dialogType, templateType, parent ); } -KoTemplateChooseDia::ReturnType KoTemplateChooseDia::choose(KInstance* instance, TQString &file, +KoTemplateChooseDia::ReturnType KoTemplateChooseDia::choose(TDEInstance* instance, TQString &file, const TQCString &format, const TQString &nativeName, const TQStringList& extraNativeMimeTypes, @@ -746,7 +746,7 @@ TQString KoTemplateChooseDia::descriptionText(const TQString &name, const TQStri /*================================================================*/ -TQIconViewItem * KoTCDIconCanvas::load( KoTemplateGroup *group, const TQString& name, KInstance* instance ) +TQIconViewItem * KoTCDIconCanvas::load( KoTemplateGroup *group, const TQString& name, TDEInstance* instance ) { TQIconViewItem * itemtoreturn = 0; diff --git a/lib/kofficeui/KoTemplateChooseDia.h b/lib/kofficeui/KoTemplateChooseDia.h index 5bedde843..d39bc7eec 100644 --- a/lib/kofficeui/KoTemplateChooseDia.h +++ b/lib/kofficeui/KoTemplateChooseDia.h @@ -49,7 +49,7 @@ class KoTCDIconCanvas : public KIconCanvas : KIconCanvas( parent, name ) {} bool isCurrentValid() { return currentItem(); } - TQIconViewItem * load(KoTemplateGroup *group, const TQString& name, KInstance* instance); + TQIconViewItem * load(KoTemplateGroup *group, const TQString& name, TDEInstance* instance); protected: virtual void keyPressEvent( TQKeyEvent *e ) { @@ -118,7 +118,7 @@ class KoTCDRecentFilesIconView : public KFileIconView { TQLabel* toolTip; }; -class KInstance; +class TDEInstance; class KoTemplateChooseDiaPrivate; /** @@ -159,7 +159,7 @@ public: * This is the static method you'll normally use to show the * dialog. * - * @param instance the KInstance of your app + * @param instance the TDEInstance of your app * The native mimetype is retrieved from the (desktop file of) that instance. * @param file this is the filename which is returned to your app * More precisely, it's a url (to give to KURL) if ReturnType is File @@ -171,14 +171,14 @@ public: * @param parent pointer to parent widget * @return The return type (see above) */ - static ReturnType choose(KInstance* instance, TQString &file, + static ReturnType choose(TDEInstance* instance, TQString &file, const DialogType &dialogType, const TQCString& templateType, TQWidget* parent); private: /// Ditto, with extraNativeMimeTypes added - static ReturnType choose(KInstance* instance, TQString &file, + static ReturnType choose(TDEInstance* instance, TQString &file, const TQCString &format, const TQString &nativeName, const TQStringList& extraNativeMimeTypes, @@ -215,7 +215,7 @@ private: * * @param parent parent the parent of the dialog * @param name the TQt internal name - * @param instance the KInstance of your app + * @param instance the TDEInstance of your app * @param format is the mimetype of the app (e.g. application/x-kspread) * @param nativeName is the name of your app (e.g KSpread) * @param dialogType the type of the dialog @@ -224,7 +224,7 @@ private: * * @return The return type (see above) */ - KoTemplateChooseDia(TQWidget *parent, const char *name, KInstance* instance, + KoTemplateChooseDia(TQWidget *parent, const char *name, TDEInstance* instance, const TQCString &format, const TQString &nativeName, const TQStringList &extraNativeMimeTypes, diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp index 916847263..c3b206e80 100644 --- a/lib/kofficeui/KoTemplateCreateDia.cpp +++ b/lib/kofficeui/KoTemplateCreateDia.cpp @@ -55,7 +55,7 @@ class KoTemplateCreateDiaPrivate { public: - KoTemplateCreateDiaPrivate( TQWidget* /*parent*/, KInstance * instance) + KoTemplateCreateDiaPrivate( TQWidget* /*parent*/, TDEInstance * instance) : m_instance( instance ), m_tempFile( TQString(), ".png" ) { m_tree=0L; @@ -84,7 +84,7 @@ public: KListView *m_groups; TQPushButton *m_add, *m_remove; TQCheckBox *m_defaultTemplate; - KInstance *m_instance; + TDEInstance *m_instance; bool m_changed; /// Temp file for remote picture file KTempFile m_tempFile; @@ -97,7 +97,7 @@ public: * ****************************************************************************/ -KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, KInstance *instance, +KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, TDEInstance *instance, const TQString &file, const TQPixmap &pix, TQWidget *parent ) : KDialogBase( parent, "template create dia", true, i18n( "Create Template" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok ), m_file(file), m_pixmap(pix) { @@ -200,7 +200,7 @@ void KoTemplateCreateDia::slotSelectionChanged() } } -void KoTemplateCreateDia::createTemplate( const TQCString &templateType, KInstance *instance, +void KoTemplateCreateDia::createTemplate( const TQCString &templateType, TDEInstance *instance, const TQString &file, const TQPixmap &pix, TQWidget *parent ) { KoTemplateCreateDia *dia = new KoTemplateCreateDia( templateType, instance, file, pix, parent ); diff --git a/lib/kofficeui/KoTemplateCreateDia.h b/lib/kofficeui/KoTemplateCreateDia.h index e3e303225..73833975e 100644 --- a/lib/kofficeui/KoTemplateCreateDia.h +++ b/lib/kofficeui/KoTemplateCreateDia.h @@ -28,7 +28,7 @@ class TQString; class TQPixmap; class TQWidget; -class KInstance; +class TDEInstance; class KLineEdit; class TQListViewItem; class KoTemplateCreateDiaPrivate; @@ -45,11 +45,11 @@ class KOFFICEUI_EXPORT KoTemplateCreateDia : public KDialogBase public: - KoTemplateCreateDia( const TQCString &templateType, KInstance *instance, + KoTemplateCreateDia( const TQCString &templateType, TDEInstance *instance, const TQString &file, const TQPixmap &pix, TQWidget *parent=0L ); ~KoTemplateCreateDia(); - static void createTemplate( const TQCString &templateType, KInstance *instance, + static void createTemplate( const TQCString &templateType, TDEInstance *instance, const TQString &file, const TQPixmap &pix, TQWidget *parent=0L ); protected: diff --git a/lib/kofficeui/KoToolBox.cpp b/lib/kofficeui/KoToolBox.cpp index db4d6467c..ba3c3a9be 100644 --- a/lib/kofficeui/KoToolBox.cpp +++ b/lib/kofficeui/KoToolBox.cpp @@ -44,7 +44,7 @@ #include <config.h> #endif -KoToolBox::KoToolBox( KMainWindow *mainWin, const char* name, KInstance* instance, int numberOfTooltypes ) +KoToolBox::KoToolBox( KMainWindow *mainWin, const char* name, TDEInstance* instance, int numberOfTooltypes ) : KToolBar( mainWin, TQt::DockLeft, false, name, true, true), m_instance(instance) { setFullSize( false ); diff --git a/lib/kofficeui/KoToolBox.h b/lib/kofficeui/KoToolBox.h index 4b83f03c1..25c9f1c4d 100644 --- a/lib/kofficeui/KoToolBox.h +++ b/lib/kofficeui/KoToolBox.h @@ -49,7 +49,7 @@ class KOFFICEUI_EXPORT KoToolBox : public KToolBar { public: - KoToolBox( KMainWindow *mainWin, const char* name, KInstance* instance, int numberOfTooltypes); + KoToolBox( KMainWindow *mainWin, const char* name, TDEInstance* instance, int numberOfTooltypes); virtual ~KoToolBox(); // Called by the toolcontroller for each tool. For every category, @@ -88,7 +88,7 @@ private: TQPtrList<ToolList> m_tools; TQPtrList<KAction> m_idToActionMap; // Map the buttongroup id's to actions for easy activating. - KInstance* m_instance; + TDEInstance* m_instance; }; diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp index 10334c32c..cc606584a 100644 --- a/lib/kofficeui/KoTooluButton.cpp +++ b/lib/kofficeui/KoTooluButton.cpp @@ -646,7 +646,7 @@ void KoColorPopupProxy::slotMoreColors() KoToolButton::KoToolButton( const TQString& icon, int id, TQWidget* parent, - const char* name, const TQString& txt, KInstance* _instance ) : + const char* name, const TQString& txt, TDEInstance* _instance ) : KToolBarButton( icon, id, parent, name, txt, _instance ), m_arrowPressed( false ) { init(); diff --git a/lib/kofficeui/KoTooluButton.h b/lib/kofficeui/KoTooluButton.h index 78d67cd5d..4e1fab71b 100644 --- a/lib/kofficeui/KoTooluButton.h +++ b/lib/kofficeui/KoTooluButton.h @@ -145,7 +145,7 @@ public: */ KoToolButton( const TQString& icon, int id, TQWidget* parent, const char* name = 0L, const TQString& txt = TQString(), - KInstance* _instance = KGlobal::instance() ); + TDEInstance* _instance = KGlobal::instance() ); /** * Construct a button with an existing pixmap. It is not diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp index e09ef63d4..201afa8ec 100644 --- a/lib/kofficeui/kcoloractions.cpp +++ b/lib/kofficeui/kcoloractions.cpp @@ -245,7 +245,7 @@ int KSelectColorAction::plug( TQWidget* w, int index ) if ( hasIcon() ) { /* ###### CHECK: We're not allowed to specify the instance in iconSet() - KInstance *instance; + TDEInstance *instance; if ( parentCollection() ) instance = parentCollection()->instance(); else @@ -281,7 +281,7 @@ int KSelectColorAction::plug( TQWidget* w, int index ) KToolBar *bar = static_cast<KToolBar *>( w ); int id_ = getToolButtonID(); - KInstance *instance; + TDEInstance *instance; if ( parentCollection() ) instance = parentCollection()->instance(); else diff --git a/lib/kofficeui/tkaction.cpp b/lib/kofficeui/tkaction.cpp index 65b4de02e..402c8d2c5 100644 --- a/lib/kofficeui/tkaction.cpp +++ b/lib/kofficeui/tkaction.cpp @@ -56,7 +56,7 @@ int TKAction::plug(TQWidget* widget, int index) if ( widget->inherits("KToolBar") ) { KToolBar* bar = static_cast<KToolBar*>(widget); int id_ = KAction::getToolButtonID(); - KInstance *instance; + TDEInstance *instance; if ( parentCollection() ) instance = parentCollection()->instance(); diff --git a/lib/kofficeui/tktoolbarbutton.cpp b/lib/kofficeui/tktoolbarbutton.cpp index 8a2798e0f..c1b2f8cba 100644 --- a/lib/kofficeui/tktoolbarbutton.cpp +++ b/lib/kofficeui/tktoolbarbutton.cpp @@ -85,12 +85,12 @@ public: TQTimer *m_delayTimer; TQPopupMenu *m_popup; - KInstance *m_instance; + TDEInstance *m_instance; }; TKToolBarButton::TKToolBarButton( const TQString& icon, const TQString& txt, TQWidget* parent, const char* name, - KInstance *instance ) + TDEInstance *instance ) : TQToolButton(parent,name) { d = new TKToolBarButtonPrivate; diff --git a/lib/kofficeui/tktoolbarbutton.h b/lib/kofficeui/tktoolbarbutton.h index 17fc37584..bfa3a1480 100644 --- a/lib/kofficeui/tktoolbarbutton.h +++ b/lib/kofficeui/tktoolbarbutton.h @@ -27,7 +27,7 @@ #include <kglobal.h> class KToolBar; -class KInstance; +class TDEInstance; class TQPopupMenu; class TQPainter; @@ -37,7 +37,7 @@ class TKToolBarButton : public TQToolButton public: TKToolBarButton(const TQString& icon, const TQString& txt, TQWidget* parent = 0, const char *name=0L, - KInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = KGlobal::instance()); TKToolBarButton(const TQPixmap&, const TQString&, TQWidget* parent=0, const char* name=0); ~TKToolBarButton(); diff --git a/lib/koproperty/test/main.cpp b/lib/koproperty/test/main.cpp index 2ac77391b..818d66379 100644 --- a/lib/koproperty/test/main.cpp +++ b/lib/koproperty/test/main.cpp @@ -36,8 +36,8 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("proptest", "KoProperty Test", version, description, - KAboutData::License_GPL, "(C) 2005 Cedric Pasteur", 0, 0, "cedric.pasteur@free.fr"); + TDEAboutData about("proptest", "KoProperty Test", version, description, + TDEAboutData::License_GPL, "(C) 2005 Cedric Pasteur", 0, 0, "cedric.pasteur@free.fr"); about.addAuthor( "Cedric Pasteur", 0, "cedric.pasteur@free.fr" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp index cb8116c9d..47d7004b2 100644 --- a/lib/kotext/KoTextView.cpp +++ b/lib/kotext/KoTextView.cpp @@ -1087,7 +1087,7 @@ KoLinkVariable * KoTextView::linkVariable() return dynamic_cast<KoLinkVariable *>(variable()); } -TQPtrList<KAction> KoTextView::dataToolActionList(KInstance * instance, const TQString& word, bool & _singleWord ) +TQPtrList<KAction> KoTextView::dataToolActionList(TDEInstance * instance, const TQString& word, bool & _singleWord ) { m_singleWord = false; m_wordUnderCursor = TQString(); diff --git a/lib/kotext/KoTextView.h b/lib/kotext/KoTextView.h index d1e9ee446..0954192bc 100644 --- a/lib/kotext/KoTextView.h +++ b/lib/kotext/KoTextView.h @@ -36,7 +36,7 @@ class KoParagCounter; class KCommand; class TQTimer; class KAction; -class KInstance; +class TDEInstance; class KDataToolInfo; class KoLinkVariable; class KoVariable; @@ -134,7 +134,7 @@ public: TQString wordUnderCursor( const KoTextCursor& cursor ); /** Return the list of actions from data-tools. Used to populate a RMB popupmenu usually. */ - TQPtrList<KAction> dataToolActionList( KInstance * instance, const TQString& word, bool & _singleWord ); + TQPtrList<KAction> dataToolActionList( TDEInstance * instance, const TQString& word, bool & _singleWord ); void insertSoftHyphen(); void insertLineBreak(); diff --git a/lib/kross/runner/main.cpp b/lib/kross/runner/main.cpp index 74c84cf36..e554fc238 100644 --- a/lib/kross/runner/main.cpp +++ b/lib/kross/runner/main.cpp @@ -98,11 +98,11 @@ int main(int argc, char **argv) { int result = ERROR_OK; - KAboutData about("krossrunner", + TDEAboutData about("krossrunner", "krossrunner", "0.1", "KDE application to run Kross scripts.", - KAboutData::License_LGPL, + TDEAboutData::License_LGPL, "(C) 2006 Sebastian Sauer", "Run Kross scripts.", "http://www.dipe.org/kross", diff --git a/lib/kross/test/main.cpp b/lib/kross/test/main.cpp index a42f9f462..275a9e93a 100644 --- a/lib/kross/test/main.cpp +++ b/lib/kross/test/main.cpp @@ -144,11 +144,11 @@ int main(int argc, char **argv) { int result = 0; - KAboutData about("krosstest", + TDEAboutData about("krosstest", "KrossTest", "0.1", "KDE application to test the Kross framework.", - KAboutData::License_LGPL, + TDEAboutData::License_LGPL, "(C) 2005 Sebastian Sauer", "Test the Kross framework!", "http://www.dipe.org/kross", |