diff options
Diffstat (limited to 'kexi')
128 files changed, 738 insertions, 738 deletions
diff --git a/kexi/core/kexiactionproxy.cpp b/kexi/core/kexiactionproxy.cpp index 851a4d3a..72004434 100644 --- a/kexi/core/kexiactionproxy.cpp +++ b/kexi/core/kexiactionproxy.cpp @@ -29,16 +29,16 @@ #include <tqsignal.h> #include <tqiconset.h> -KAction_setEnabled_Helper::KAction_setEnabled_Helper(KexiActionProxy* proxy) - : TQObject(0,"KAction_setEnabled_Helper") +TDEAction_setEnabled_Helper::TDEAction_setEnabled_Helper(KexiActionProxy* proxy) + : TQObject(0,"TDEAction_setEnabled_Helper") , m_proxy( proxy ) { } -void KAction_setEnabled_Helper::slotSetEnabled(bool enabled) +void TDEAction_setEnabled_Helper::slotSetEnabled(bool enabled) { - if (sender()->inherits("KAction")) { - const KAction *a = static_cast<const KAction*>(sender()); + if (sender()->inherits("TDEAction")) { + const TDEAction *a = static_cast<const TDEAction*>(sender()); m_proxy->setAvailable(a->name(), enabled); } } @@ -81,7 +81,7 @@ KexiActionProxy::KexiActionProxy(TQObject *receiver, KexiSharedActionHost *host) , m_signals(47) , m_actionProxyParent(0) , m_signal_parent( 0, "signal_parent" ) - , m_KAction_setEnabled_helper( new KAction_setEnabled_Helper(this) ) + , m_TDEAction_setEnabled_helper( new TDEAction_setEnabled_Helper(this) ) , m_focusedChild(0) { m_signals.setAutoDelete(true); @@ -103,7 +103,7 @@ KexiActionProxy::~KexiActionProxy() m_host->takeActionProxyFor(m_receiver); - delete m_KAction_setEnabled_helper; + delete m_TDEAction_setEnabled_helper; } void KexiActionProxy::plugSharedAction(const char *action_name, TQObject* receiver, const char *slot) @@ -130,7 +130,7 @@ void KexiActionProxy::unplugSharedAction(const char *action_name) int KexiActionProxy::plugSharedAction(const char *action_name, TQWidget* w) { - KAction *a = sharedAction(action_name); + TDEAction *a = sharedAction(action_name); if (!a) { kdWarning() << "KexiActionProxy::plugSharedAction(): NO SUCH ACTION: " << action_name << endl; return -1; @@ -140,7 +140,7 @@ int KexiActionProxy::plugSharedAction(const char *action_name, TQWidget* w) void KexiActionProxy::unplugSharedAction(const char *action_name, TQWidget* w) { - KAction *a = sharedAction(action_name); + TDEAction *a = sharedAction(action_name); if (!a) { kdWarning() << "KexiActionProxy::unplugSharedAction(): NO SUCH ACTION: " << action_name << endl; return; @@ -148,16 +148,16 @@ void KexiActionProxy::unplugSharedAction(const char *action_name, TQWidget* w) a->unplug(w); } -KAction* KexiActionProxy::plugSharedAction(const char *action_name, const TQString& alternativeText, TQWidget* w) +TDEAction* KexiActionProxy::plugSharedAction(const char *action_name, const TQString& alternativeText, TQWidget* w) { - KAction *a = sharedAction(action_name); + TDEAction *a = sharedAction(action_name); if (!a) { kdWarning() << "KexiActionProxy::plugSharedAction(): NO SUCH ACTION: " << action_name << endl; return 0; } TQCString altName = a->name(); altName += "_alt"; - KAction *alt_act = new KAction(alternativeText, a->iconSet(), a->shortcut(), + TDEAction *alt_act = new TDEAction(alternativeText, a->iconSet(), a->shortcut(), 0, 0, a->parent(), altName); TQObject::connect(alt_act, TQT_SIGNAL(activated()), a, TQT_SLOT(activate())); alt_act->plug(w); @@ -170,7 +170,7 @@ KAction* KexiActionProxy::plugSharedAction(const char *action_name, const TQStri void KexiActionProxy::plugSharedActionToExternalGUI(const char *action_name, KXMLGUIClient *client) { - KAction *a = client->action(action_name); + TDEAction *a = client->action(action_name); if (!a) return; plugSharedAction(a->name(), a, TQT_SLOT(activate())); @@ -178,7 +178,7 @@ void KexiActionProxy::plugSharedActionToExternalGUI(const char *action_name, KXM //update availability setAvailable(a->name(), a->isEnabled()); //changes will be signaled - TQObject::connect(a, TQT_SIGNAL(enabled(bool)), m_KAction_setEnabled_helper, TQT_SLOT(slotSetEnabled(bool))); + TQObject::connect(a, TQT_SIGNAL(enabled(bool)), m_TDEAction_setEnabled_helper, TQT_SLOT(slotSetEnabled(bool))); } void KexiActionProxy::plugSharedActionsToExternalGUI( @@ -208,7 +208,7 @@ bool KexiActionProxy::activateSharedAction(const char *action_name, bool alsoChe return true; } -KAction* KexiActionProxy::sharedAction(const char* action_name) +TDEAction* KexiActionProxy::sharedAction(const char* action_name) { return m_host->mainWindow()->actionCollection()->action(action_name); } diff --git a/kexi/core/kexiactionproxy.h b/kexi/core/kexiactionproxy.h index 163efced..d9868976 100644 --- a/kexi/core/kexiactionproxy.h +++ b/kexi/core/kexiactionproxy.h @@ -32,9 +32,9 @@ #include "kexisharedactionhost.h" class TQSignal; -class KAction; +class TDEAction; class KXMLGUIClient; -class KAction_setEnabled_Helper; +class TDEAction_setEnabled_Helper; class KexiActionProxy; //! Abstract helper class used to connect shared actions from outside of shared-action-aware object. @@ -122,7 +122,7 @@ class KEXICORE_EXPORT KexiActionProxy Does nothing if no action found, so generally this is safer than just caling e.g. <code> action("myaction")->plug(myPopup); </code> \return index of inserted item, or -1 if there is not action with name \a action_name. - \sa action(), KAction::plug(TQWidget*, int) */ + \sa action(), TDEAction::plug(TQWidget*, int) */ int plugSharedAction(const char *action_name, TQWidget* w); void plugSharedActionToExternalGUI(const char *action_name, KXMLGUIClient *client); @@ -139,10 +139,10 @@ class KEXICORE_EXPORT KexiActionProxy specified by \a action_name is activated. The aternative action has autmatically set name as: action_name + "_alt". \return newly created action or 0 if \a action_name not found. */ - KAction* plugSharedAction(const char *action_name, const TQString& alternativeText, TQWidget* w); + TDEAction* plugSharedAction(const char *action_name, const TQString& alternativeText, TQWidget* w); /*! \return action named with \a name or NULL if there is no such action. */ - virtual KAction* sharedAction(const char* action_name); + virtual TDEAction* sharedAction(const char* action_name); inline TQObject *receiver() const { return m_receiver; } @@ -165,14 +165,14 @@ class KEXICORE_EXPORT KexiActionProxy TQPtrList<KexiActionProxy> m_sharedActionChildren; - TQPtrList<KAction> m_alternativeActions; + TQPtrList<TDEAction> m_alternativeActions; KexiActionProxy* m_actionProxyParent; TQObject m_signal_parent; //!< it's just to have common parent for owned signals //! For internal use by plugSharedActionToExternalGUI() - KAction_setEnabled_Helper *m_KAction_setEnabled_helper; + TDEAction_setEnabled_Helper *m_TDEAction_setEnabled_helper; public: //! For internal use by addActionProxyChild(). \a parent can be 0. @@ -182,7 +182,7 @@ class KEXICORE_EXPORT KexiActionProxy KexiActionProxy *m_focusedChild; friend class KexiSharedActionHost; - friend class KAction_setEnabled_Helper; + friend class TDEAction_setEnabled_Helper; friend class KexiSharedActionConnector; }; diff --git a/kexi/core/kexiactionproxy_p.h b/kexi/core/kexiactionproxy_p.h index 07931b9c..57d351ce 100644 --- a/kexi/core/kexiactionproxy_p.h +++ b/kexi/core/kexiactionproxy_p.h @@ -25,12 +25,12 @@ class KexiActionProxy; //! Helper class for KexiActionProxy::plugSharedActionToExternalGUI() method. -class KAction_setEnabled_Helper : public TQObject +class TDEAction_setEnabled_Helper : public TQObject { Q_OBJECT public: - KAction_setEnabled_Helper(KexiActionProxy* proxy); + TDEAction_setEnabled_Helper(KexiActionProxy* proxy); public slots: void slotSetEnabled(bool enabled); diff --git a/kexi/core/kexidialogbase.h b/kexi/core/kexidialogbase.h index cf455885..ae1169a9 100644 --- a/kexi/core/kexidialogbase.h +++ b/kexi/core/kexidialogbase.h @@ -34,7 +34,7 @@ class TQWidgetStack; class KexiMainWindow; class KexiViewBase; -class KActionCollection; +class TDEActionCollection; class KexiContextHelpInfo; namespace KexiPart { class Part; diff --git a/kexi/core/keximainwindow.h b/kexi/core/keximainwindow.h index 4dbb6b18..1f14e0d6 100644 --- a/kexi/core/keximainwindow.h +++ b/kexi/core/keximainwindow.h @@ -75,7 +75,7 @@ class KEXICORE_EXPORT KexiMainWindow : public KMdiMainFrm, public KexiSharedActi /*! \return a list of all actions defined by application. Not all of them are shared. Don't use plug these actions in your windows by hand but user methods from KexiViewBase! */ - virtual KActionPtrList allActions() const = 0; + virtual TDEActionPtrList allActions() const = 0; /*! \return currently active dialog (window) od 0 if there is no active dialog. */ virtual KexiDialogBase* currentDialog() const = 0; diff --git a/kexi/core/kexipart.cpp b/kexi/core/kexipart.cpp index 49f1aeab..e1ed78fe 100644 --- a/kexi/core/kexipart.cpp +++ b/kexi/core/kexipart.cpp @@ -126,11 +126,11 @@ void Part::createGUIClients(KexiMainWindow *win) m_guiClient = new GUIClient(m_mainWin, this, false, "part"); //default actions for part's gui client: - KAction *act = new KAction(m_names["instanceCaption"]+"...", info()->createItemIcon(), 0, this, + TDEAction *act = new TDEAction(m_names["instanceCaption"]+"...", info()->createItemIcon(), 0, this, TQT_SLOT(slotCreate()), m_mainWin->actionCollection(), KexiPart::nameForCreateAction(*info())); act->plug( m_mainWin->findPopupMenu("insert") ); -// new KAction(m_names["instance"]+"...", info()->itemIcon(), 0, this, +// new TDEAction(m_names["instance"]+"...", info()->itemIcon(), 0, this, // TQT_SLOT(create()), m_guiClient->actionCollection(), (info()->objectName()+"part_create").latin1()); //let init specific actions for parts // initPartActions( m_guiClient->actionCollection() ); @@ -161,14 +161,14 @@ void Part::createGUIClients(KexiMainWindow *win) } } -KActionCollection* Part::actionCollectionForMode(int viewMode) const +TDEActionCollection* Part::actionCollectionForMode(int viewMode) const { KXMLGUIClient *cli = m_instanceGuiClients[viewMode]; return cli ? cli->actionCollection() : 0; } -KAction* Part::createSharedAction(int mode, const TQString &text, - const TQString &pix_name, const KShortcut &cut, const char *name, +TDEAction* Part::createSharedAction(int mode, const TQString &text, + const TQString &pix_name, const TDEShortcut &cut, const char *name, const char *subclassName) { GUIClient *instanceGuiClient = m_instanceGuiClients[mode]; @@ -180,8 +180,8 @@ KAction* Part::createSharedAction(int mode, const TQString &text, instanceGuiClient->actionCollection(), subclassName); } -KAction* Part::createSharedPartAction(const TQString &text, - const TQString &pix_name, const KShortcut &cut, const char *name, +TDEAction* Part::createSharedPartAction(const TQString &text, + const TQString &pix_name, const TDEShortcut &cut, const char *name, const char *subclassName) { if (!m_guiClient) @@ -190,19 +190,19 @@ KAction* Part::createSharedPartAction(const TQString &text, m_guiClient->actionCollection(), subclassName); } -KAction* Part::createSharedToggleAction(int mode, const TQString &text, - const TQString &pix_name, const KShortcut &cut, const char *name) +TDEAction* Part::createSharedToggleAction(int mode, const TQString &text, + const TQString &pix_name, const TDEShortcut &cut, const char *name) { - return createSharedAction(mode, text, pix_name, cut, name, "KToggleAction"); + return createSharedAction(mode, text, pix_name, cut, name, "TDEToggleAction"); } -KAction* Part::createSharedPartToggleAction(const TQString &text, - const TQString &pix_name, const KShortcut &cut, const char *name) +TDEAction* Part::createSharedPartToggleAction(const TQString &text, + const TQString &pix_name, const TDEShortcut &cut, const char *name) { - return createSharedPartAction(text, pix_name, cut, name, "KToggleAction"); + return createSharedPartAction(text, pix_name, cut, name, "TDEToggleAction"); } -/*KAction* Part::sharedAction(int mode, const char* name, const char *classname) +/*TDEAction* Part::sharedAction(int mode, const char* name, const char *classname) { GUIClient *instanceGuiClient = m_instanceGuiClients[mode]; if (!instanceGuiClient) { @@ -212,7 +212,7 @@ KAction* Part::createSharedPartToggleAction(const TQString &text, return instanceGuiClient->actionCollection()->action(name, classname); } -KAction* Part::sharedPartAction(int mode, const char* name, const char *classname) +TDEAction* Part::sharedPartAction(int mode, const char* name, const char *classname) { if (!m_guiClient) return 0; @@ -223,7 +223,7 @@ void Part::setActionAvailable(const char *action_name, bool avail) { TQIntDictIterator<GUIClient> it( m_instanceGuiClients ); for (;it.current();++it) { - KAction *act = it.current()->actionCollection()->action(action_name); + TDEAction *act = it.current()->actionCollection()->action(action_name); if (act) { act->setEnabled(avail); return; @@ -438,10 +438,10 @@ GUIClient::GUIClient(KexiMainWindow *win, Part* part, bool partInstanceClient, c setXMLFile(TQString::fromLatin1("kexi")+part->info()->objectName() +"part"+(partInstanceClient?"inst":"")+"ui.rc"); -// new KAction(part->m_names["new"], part->info()->itemIcon(), 0, this, +// new TDEAction(part->m_names["new"], part->info()->itemIcon(), 0, this, // TQT_SLOT(create()), actionCollection(), (part->info()->objectName()+"part_create").latin1()); -// new KAction(i18nInstanceName+"...", part->info()->itemIcon(), 0, this, +// new TDEAction(i18nInstanceName+"...", part->info()->itemIcon(), 0, this, // TQT_SLOT(create()), actionCollection(), (part->info()->objectName()+"part_create").latin1()); // win->guiFactory()->addClient(this); diff --git a/kexi/core/kexipart.h b/kexi/core/kexipart.h index 752140d1..1d800854 100644 --- a/kexi/core/kexipart.h +++ b/kexi/core/kexipart.h @@ -28,13 +28,13 @@ #include "kexi.h" #include "keximainwindow.h" -class KActionCollection; +class TDEActionCollection; class KexiDialogBase; class KexiDialogTempData; class KexiViewBase; class KexiMainWindowImpl; -class KAction; -class KShortcut; +class TDEAction; +class TDEShortcut; class KTabWidget; namespace KexiPart @@ -184,7 +184,7 @@ class KEXICORE_EXPORT Part : public TQObject #endif /*! \return action collection for mode \a viewMode. */ - KActionCollection* actionCollectionForMode(int viewMode) const; + TDEActionCollection* actionCollectionForMode(int viewMode) const; const Kexi::ObjectStatus& lastOperationStatus() const { return m_status; } @@ -222,14 +222,14 @@ class KEXICORE_EXPORT Part : public TQObject void createGUIClients(KexiMainWindow *win); #if 0 - /*! For reimplementation. Create here all part actions (KAction or similar). + /*! For reimplementation. Create here all part actions (TDEAction or similar). "Part action" is an action that is bound to given part, not for dialogs created with this part, eg. "Open external project" action for Form part. Default implementation does nothing. */ - virtual void initPartActions( KActionCollection * ) {}; + virtual void initPartActions( TDEActionCollection * ) {}; - /*! For reimplementation. You should here create all instance actions (KAction or similar) + /*! For reimplementation. You should here create all instance actions (TDEAction or similar) for \a mode (this method called for every value given by Kexi::ViewMode enum, and in special cases, in the future - for user-defined part-specific modes). Actions should be bound to action collection \a col. @@ -241,7 +241,7 @@ class KEXICORE_EXPORT Part : public TQObject all supported views. Default implementation does nothing. */ - virtual void initInstanceActions( int mode, KActionCollection *col ) {}; + virtual void initInstanceActions( int mode, TDEActionCollection *col ) {}; #endif virtual void initPartActions(); @@ -255,29 +255,29 @@ class KEXICORE_EXPORT Part : public TQObject /*! Creates shared action for action collection declared for 'instance actions' of this part. See KexiSharedActionHost::createSharedAction() for details. - Pass desired KAction subclass with \a subclassName (e.g. "KToggleAction") to have - that subclass allocated instead just KAction (what is the default). */ - KAction* createSharedAction(int mode, const TQString &text, - const TQString &pix_name, const KShortcut &cut, const char *name, + Pass desired TDEAction subclass with \a subclassName (e.g. "TDEToggleAction") to have + that subclass allocated instead just TDEAction (what is the default). */ + TDEAction* createSharedAction(int mode, const TQString &text, + const TQString &pix_name, const TDEShortcut &cut, const char *name, const char *subclassName = 0); /*! Convenience version of above method - creates shared toggle action. */ - KAction* createSharedToggleAction(int mode, const TQString &text, - const TQString &pix_name, const KShortcut &cut, const char *name); + TDEAction* createSharedToggleAction(int mode, const TQString &text, + const TQString &pix_name, const TDEShortcut &cut, const char *name); /*! Creates shared action for action collection declared for 'part actions' of this part. See KexiSharedActionHost::createSharedAction() for details. - Pass desired KAction subclass with \a subclassName (e.g. "KToggleAction") to have - that subclass allocated instead just KAction (what is the default). */ - KAction* createSharedPartAction(const TQString &text, - const TQString &pix_name, const KShortcut &cut, const char *name, + Pass desired TDEAction subclass with \a subclassName (e.g. "TDEToggleAction") to have + that subclass allocated instead just TDEAction (what is the default). */ + TDEAction* createSharedPartAction(const TQString &text, + const TQString &pix_name, const TDEShortcut &cut, const char *name, const char *subclassName = 0); /*! Convenience version of above method - creates shared toggle action for 'part actions' of this part. */ - KAction* createSharedPartToggleAction(const TQString &text, - const TQString &pix_name, const KShortcut &cut, const char *name); + TDEAction* createSharedPartToggleAction(const TQString &text, + const TQString &pix_name, const TDEShortcut &cut, const char *name); void setActionAvailable(const char *action_name, bool avail); diff --git a/kexi/core/kexipartinfo.h b/kexi/core/kexipartinfo.h index b7ad6f29..2159377d 100644 --- a/kexi/core/kexipartinfo.h +++ b/kexi/core/kexipartinfo.h @@ -150,7 +150,7 @@ class KEXICORE_EXPORT Info Private *d; }; -/*! \return "create" KAction's name for part defined by \a info. +/*! \return "create" TDEAction's name for part defined by \a info. The result is like "tablepart_create". Used in Part::createGUIClients() and KexiBrowser. */ KEXICORE_EXPORT TQCString nameForCreateAction(const Info& info); diff --git a/kexi/core/kexisharedactionhost.cpp b/kexi/core/kexisharedactionhost.cpp index 4c7bc9ea..550cfe7c 100644 --- a/kexi/core/kexisharedactionhost.cpp +++ b/kexi/core/kexisharedactionhost.cpp @@ -80,7 +80,7 @@ void KexiSharedActionHost::setAsDefaultHost() //-------------------------------------------------- -KexiSharedActionHost::KexiSharedActionHost(KMainWindow* mainWin) +KexiSharedActionHost::KexiSharedActionHost(TDEMainWindow* mainWin) : d( new KexiSharedActionHostPrivate(this) ) { d->mainWin = mainWin; @@ -98,7 +98,7 @@ KexiSharedActionHost::~KexiSharedActionHost() void KexiSharedActionHost::setActionAvailable(const char *action_name, bool avail) { - KAction *act = d->mainWin->actionCollection()->action(action_name); + TDEAction *act = d->mainWin->actionCollection()->action(action_name); if (act) { act->setEnabled(avail); } @@ -132,7 +132,7 @@ void KexiSharedActionHost::plugActionProxy(KexiActionProxy *proxy) d->actionProxies.insert( proxy->receiver(), proxy ); } -KMainWindow* KexiSharedActionHost::mainWindow() const +TDEMainWindow* KexiSharedActionHost::mainWindow() const { return d->mainWin; } @@ -144,12 +144,12 @@ void KexiSharedActionHost::invalidateSharedActions(TQObject *o) bool insideDialogBase = o && (o->inherits("KexiDialogBase") || 0!=KexiUtils::findParent<KexiDialogBase>(o, "KexiDialogBase")); KexiActionProxy *p = o ? d->actionProxies[ o ] : 0; - for (KActionPtrList::ConstIterator it=d->sharedActions.constBegin(); it!=d->sharedActions.constEnd(); ++it) { + for (TDEActionPtrList::ConstIterator it=d->sharedActions.constBegin(); it!=d->sharedActions.constEnd(); ++it) { // setActionAvailable((*it)->name(),p && p->isAvailable((*it)->name())); - KAction *a = *it; + TDEAction *a = *it; if (!insideDialogBase && d->mainWin->actionCollection()!=a->parentCollection()) { //o is not KexiDialogBase or its child: - // only invalidate action if it comes from mainwindow's KActionCollection + // only invalidate action if it comes from mainwindow's TDEActionCollection // (thus part-actions are untouched when the focus is e.g. in the Property Editor) continue; } @@ -157,7 +157,7 @@ void KexiSharedActionHost::invalidateSharedActions(TQObject *o) KexiVolatileActionData *va = d->volatileActions[ a ]; if (va != 0) { if (p && p->isSupported(a->name())) { - TQPtrList<KAction> actions_list; + TQPtrList<TDEAction> actions_list; actions_list.append( a ); if (!va->plugged) { va->plugged=true; @@ -212,7 +212,7 @@ TQWidget* KexiSharedActionHost::focusWindow() return fw; } -KAction* KexiSharedActionHost::createSharedActionInternal( KAction *action ) +TDEAction* KexiSharedActionHost::createSharedActionInternal( TDEAction *action ) { TQObject::connect(action,TQT_SIGNAL(activated()), &d->actionMapper, TQT_SLOT(map())); d->actionMapper.setMapping(action, action->name()); @@ -220,63 +220,63 @@ KAction* KexiSharedActionHost::createSharedActionInternal( KAction *action ) return action; } -KActionPtrList KexiSharedActionHost::sharedActions() const +TDEActionPtrList KexiSharedActionHost::sharedActions() const { return d->sharedActions; } -/*class KexiAction : public KAction +/*class KexiAction : public TDEAction { public: KexiAction(const TQString &text, const TQIconSet &pix, - const KShortcut &cut, const TQObject *receiver, - const char *slot, KActionCollection *parent, const char *name) - : KAction(text,pix,cut,receiver,slot,parent,name) + const TDEShortcut &cut, const TQObject *receiver, + const char *slot, TDEActionCollection *parent, const char *name) + : TDEAction(text,pix,cut,receiver,slot,parent,name) { } TQPtrDict<TQWidget> unplugged; };*/ -KAction* KexiSharedActionHost::createSharedAction(const TQString &text, const TQString &pix_name, - const KShortcut &cut, const char *name, KActionCollection* col, const char *subclassName) +TDEAction* KexiSharedActionHost::createSharedAction(const TQString &text, const TQString &pix_name, + const TDEShortcut &cut, const char *name, TDEActionCollection* col, const char *subclassName) { if (subclassName==0) return createSharedActionInternal( - new KAction(text, pix_name, + new TDEAction(text, pix_name, cut, 0/*receiver*/, 0/*slot*/, col ? col : d->mainWin->actionCollection(), name) ); - else if (tqstricmp(subclassName,"KToggleAction")==0) + else if (tqstricmp(subclassName,"TDEToggleAction")==0) return createSharedActionInternal( - new KToggleAction(text, pix_name, + new TDEToggleAction(text, pix_name, cut, 0/*receiver*/, 0/*slot*/, col ? col : d->mainWin->actionCollection(), name) ); - else if (tqstricmp(subclassName,"KActionMenu")==0) + else if (tqstricmp(subclassName,"TDEActionMenu")==0) return createSharedActionInternal( - new KActionMenu(text, pix_name, col ? col : d->mainWin->actionCollection(), name) + new TDEActionMenu(text, pix_name, col ? col : d->mainWin->actionCollection(), name) ); -//TODO: more KAction subclasses +//TODO: more TDEAction subclasses return 0; } -KAction* KexiSharedActionHost::createSharedAction( KStdAction::StdAction id, const char *name, - KActionCollection* col) +TDEAction* KexiSharedActionHost::createSharedAction( KStdAction::StdAction id, const char *name, + TDEActionCollection* col) { return createSharedActionInternal( KStdAction::create( id, name, 0/*receiver*/, 0/*slot*/, col ? col : d->mainWin->actionCollection() ) ); } -KAction* KexiSharedActionHost::createSharedAction(const KGuiItem& guiItem, const KShortcut &cut, - const char *name, KActionCollection* col) +TDEAction* KexiSharedActionHost::createSharedAction(const KGuiItem& guiItem, const TDEShortcut &cut, + const char *name, TDEActionCollection* col) { return createSharedActionInternal( - new KAction(guiItem, cut, 0/*receiver*/, 0/*slot*/, + new TDEAction(guiItem, cut, 0/*receiver*/, 0/*slot*/, col ? col : d->mainWin->actionCollection(), name)); } -void KexiSharedActionHost::setActionVolatile( KAction *a, bool set ) +void KexiSharedActionHost::setActionVolatile( TDEAction *a, bool set ) { if (!set) { d->volatileActions.remove( a ); diff --git a/kexi/core/kexisharedactionhost.h b/kexi/core/kexisharedactionhost.h index c7fcb181..5b2046d6 100644 --- a/kexi/core/kexisharedactionhost.h +++ b/kexi/core/kexisharedactionhost.h @@ -28,9 +28,9 @@ #include <kstdaction.h> #include <kaction.h> -class KShortcut; +class TDEShortcut; class KGuiItem; -class KMainWindow; +class TDEMainWindow; class KexiActionProxy; class KexiSharedActionHostPrivate; @@ -40,7 +40,7 @@ namespace KexiPart { //! Acts as application-wide host that offers shared actions. /*! - You can inherit this class together with KMainWindow (or any KMainWindow). + You can inherit this class together with TDEMainWindow (or any TDEMainWindow). Call setAsDefaultHost() to make the host default for all shared actions that have not explicitly specified host. @@ -54,7 +54,7 @@ class KEXICORE_EXPORT KexiSharedActionHost public: /*! Constructs host for main window \a mainWin. */ - KexiSharedActionHost(KMainWindow* mainWin); + KexiSharedActionHost(TDEMainWindow* mainWin); virtual ~KexiSharedActionHost(); @@ -86,10 +86,10 @@ class KEXICORE_EXPORT KexiSharedActionHost static KexiSharedActionHost& defaultHost(); /*! \return shared actions list. */ - KActionPtrList sharedActions() const; + TDEActionPtrList sharedActions() const; /*! PROTOTYPE, DO NOT USE YET */ - void setActionVolatile( KAction *a, bool set ); + void setActionVolatile( TDEAction *a, bool set ); protected: @@ -100,7 +100,7 @@ class KEXICORE_EXPORT KexiSharedActionHost Otherwise the action is disabled. If \a o is not KexiDialogBase or its child, - actions are only invalidated if these come from mainwindow's KActionCollection + actions are only invalidated if these come from mainwindow's TDEActionCollection (thus part-actions are untouched when the focus is e.g. in the Property Editor. Call this method when it is known that some actions need invalidation @@ -118,28 +118,28 @@ class KEXICORE_EXPORT KexiSharedActionHost void updateActionAvailable(const char *action_name, bool avail, TQObject *obj); /*! \return main window for which this host is defined. */ - KMainWindow* mainWindow() const; + TDEMainWindow* mainWindow() const; /*! Creates shared action using \a text, \a pix_name pixmap, shortcut \a cut, optional \a name. You can pass your own action collection as \a col. If \a col action collection is null, main window's action will be used. - Pass desired KAction subclass with \a subclassName (e.g. "KToggleAction") to have - that subclass allocated instead just KAction (what is the default). + Pass desired TDEAction subclass with \a subclassName (e.g. "TDEToggleAction") to have + that subclass allocated instead just TDEAction (what is the default). Created action's data is owned by the main window. */ - KAction* createSharedAction(const TQString &text, const TQString &pix_name, - const KShortcut &cut, const char *name, KActionCollection* col = 0, + TDEAction* createSharedAction(const TQString &text, const TQString &pix_name, + const TDEShortcut &cut, const char *name, TDEActionCollection* col = 0, const char *subclassName = 0); /*! Like above - creates shared action, but from standard action identified by \a id. Action's data is owned by the main window. */ - KAction* createSharedAction( KStdAction::StdAction id, const char *name, - KActionCollection* col = 0); + TDEAction* createSharedAction( KStdAction::StdAction id, const char *name, + TDEActionCollection* col = 0); /*! Creates shared action with name \a name and shortcut \a cut by copying all properties of \a guiItem. If \a col action collection is null, main window's action will be used. */ - KAction* createSharedAction(const KGuiItem& guiItem, const KShortcut &cut, const char *name, - KActionCollection* col = 0); + TDEAction* createSharedAction(const KGuiItem& guiItem, const TDEShortcut &cut, const char *name, + TDEActionCollection* col = 0); /*! \return action proxy for object \a o, or NULL if this object has no plugged shared actions. */ @@ -151,7 +151,7 @@ class KEXICORE_EXPORT KexiSharedActionHost private: /*! Helper function for createSharedAction(). */ - KAction* createSharedActionInternal( KAction *action ); + TDEAction* createSharedActionInternal( TDEAction *action ); KexiSharedActionHostPrivate *d; diff --git a/kexi/core/kexisharedactionhost_p.h b/kexi/core/kexisharedactionhost_p.h index 605cc681..eef28a19 100644 --- a/kexi/core/kexisharedactionhost_p.h +++ b/kexi/core/kexisharedactionhost_p.h @@ -34,7 +34,7 @@ class KexiVolatileActionData { public: KexiVolatileActionData() { plugged=false; } -// KAction *kaction; +// TDEAction *kaction; bool plugged : 1; }; @@ -52,8 +52,8 @@ class KEXICORE_EXPORT KexiSharedActionHostPrivate : public TQObject public: TQPtrDict<KexiActionProxy> actionProxies; - KMainWindow *mainWin; - KActionPtrList sharedActions; + TDEMainWindow *mainWin; + TDEActionPtrList sharedActions; TQSignalMapper actionMapper; TQPtrDict<KexiVolatileActionData> volatileActions; TQAsciiDict<TQWidget> enablers; diff --git a/kexi/core/kexiuseraction.cpp b/kexi/core/kexiuseraction.cpp index b0966463..5a79929e 100644 --- a/kexi/core/kexiuseraction.cpp +++ b/kexi/core/kexiuseraction.cpp @@ -11,8 +11,8 @@ #include "keximainwindow.h" #include "kexiuseraction.h" -KexiUserAction::KexiUserAction(KexiMainWindow *win, KActionCollection *parent, const TQString &name, const TQString &text, const TQString &pixmap) - : KAction(text, pixmap, KShortcut::null(), this, TQT_SLOT(execute()), parent, name.latin1()) +KexiUserAction::KexiUserAction(KexiMainWindow *win, TDEActionCollection *parent, const TQString &name, const TQString &text, const TQString &pixmap) + : TDEAction(text, pixmap, TDEShortcut::null(), this, TQT_SLOT(execute()), parent, name.latin1()) { m_win = win; m_method = 0; @@ -59,7 +59,7 @@ KexiUserAction::execute() } KexiUserAction * -KexiUserAction::fromCurrentRecord(KexiMainWindow *context, KActionCollection *parent, KexiDB::Cursor *c) +KexiUserAction::fromCurrentRecord(KexiMainWindow *context, TDEActionCollection *parent, KexiDB::Cursor *c) { if(!c || c->bof() || c->eof()) return 0; diff --git a/kexi/core/kexiuseraction.h b/kexi/core/kexiuseraction.h index 57b82984..602d5751 100644 --- a/kexi/core/kexiuseraction.h +++ b/kexi/core/kexiuseraction.h @@ -16,7 +16,7 @@ typedef TQValueVector<TQVariant> Arguments; the actions can have some predefined \ref Methods which are described in \ref KexiUserActionMethod e.g. OpenObject, ExecuteScript ... those methods take different arguments also described in \ref KexiUserActionMethod */ -class KEXICORE_EXPORT KexiUserAction : public KAction +class KEXICORE_EXPORT KexiUserAction : public TDEAction { Q_OBJECT @@ -48,7 +48,7 @@ class KEXICORE_EXPORT KexiUserAction : public KAction /*! constructs an action \note methods are associated using setMethod() */ - KexiUserAction(KexiMainWindow *context, KActionCollection *parent, const TQString &name, const TQString &text, const TQString &pixmap); + KexiUserAction(KexiMainWindow *context, TDEActionCollection *parent, const TQString &name, const TQString &text, const TQString &pixmap); ~KexiUserAction(); /*! sets execution information associated with this action this will mostly look like @@ -64,11 +64,11 @@ class KEXICORE_EXPORT KexiUserAction : public KAction /*! creates a KexiUserAction from current record in \a c mostly needed for creation from kexi__useractions table */ - static KexiUserAction *fromCurrentRecord(KexiMainWindow *context, KActionCollection *parent, KexiDB::Cursor *c); + static KexiUserAction *fromCurrentRecord(KexiMainWindow *context, TDEActionCollection *parent, KexiDB::Cursor *c); protected slots: /*! actually executes the associated method - \note KexiUserAction automatically connects KAction::activated() to KexiUserAction::execute() + \note KexiUserAction automatically connects TDEAction::activated() to KexiUserAction::execute() */ void execute(); diff --git a/kexi/core/kexiviewbase.cpp b/kexi/core/kexiviewbase.cpp index 65f2e68f..c4eb3eaa 100644 --- a/kexi/core/kexiviewbase.cpp +++ b/kexi/core/kexiviewbase.cpp @@ -289,12 +289,12 @@ void KexiViewBase::setFocus() m_mainWin->invalidateSharedActions(TQT_TQOBJECT(this)); } -KAction* KexiViewBase::sharedAction( const char *action_name ) +TDEAction* KexiViewBase::sharedAction( const char *action_name ) { if (part()) { - KActionCollection *ac; + TDEActionCollection *ac; if ( (ac = part()->actionCollectionForMode( viewMode() )) ) { - KAction* a = ac->action( action_name ); + TDEAction* a = ac->action( action_name ); if (a) return a; } @@ -305,8 +305,8 @@ KAction* KexiViewBase::sharedAction( const char *action_name ) void KexiViewBase::setAvailable(const char* action_name, bool set) { if (part()) { - KActionCollection *ac; - KAction* a; + TDEActionCollection *ac; + TDEAction* a; if ( (ac = part()->actionCollectionForMode( viewMode() )) && (a = ac->action( action_name )) ) { a->setEnabled(set); //why? return; diff --git a/kexi/core/kexiviewbase.h b/kexi/core/kexiviewbase.h index b0984157..adca7622 100644 --- a/kexi/core/kexiviewbase.h +++ b/kexi/core/kexiviewbase.h @@ -97,7 +97,7 @@ class KEXICORE_EXPORT KexiViewBase : public TQWidget, public KexiActionProxy \return shared action with name \a action_name for this view. If there's no such action declared in Kexi Part (part()), global shared action is returned (if exists). */ - virtual KAction* sharedAction( const char *action_name ); + virtual TDEAction* sharedAction( const char *action_name ); /*! Enables or disables shared action declared in Kexi Part (part()). If there's no such action, global shared action is enabled or disabled (if exists). */ diff --git a/kexi/doc/dev/CHANGELOG-Kexi-js b/kexi/doc/dev/CHANGELOG-Kexi-js index c5779c17..6584f5ff 100755 --- a/kexi/doc/dev/CHANGELOG-Kexi-js +++ b/kexi/doc/dev/CHANGELOG-Kexi-js @@ -2128,7 +2128,7 @@ Form Designer - autocaption is set properly for field editor on design time - field editor's labelCaption is no longer needed - propeditor: preserve "changed" flags (marked with BOLD) between property set switching -- KAcceleratorManager::setNoAccel(QWidget*) is used for widgets in design mode +- TDEAcceleratorManager::setNoAccel(QWidget*) is used for widgets in design mode to avoid adding accelerators (for FormIO and for new widgets inserting) - factories: isPropertyVisibleInternal() is now called for superclass when needed (thus, properties like "iconText" are properly hidden) @@ -3394,7 +3394,7 @@ Parser Core - KexiSharedActionHost::invalidateSharedActions(QObject *o) if o is not KexiDialogBase or its child, - only invalidate actions if these come from mainwindow's KActionCollection + only invalidate actions if these come from mainwindow's TDEActionCollection (thus part-actions are untouched when the focus is e.g. in the Property Editor. - KexiViewBase::setDirty() -do not signal 'dirty' flag's changes if no change - ObjectStatus now also stores related KexiDB::Obeject's, for more verbose errors @@ -3776,8 +3776,8 @@ Core - KexiDialogBase now has activate(), deactivate() handlers, KexiViewBase::updateActions(bool activated) is called for a current view - Workaround found for integrating katepart's actions with Kexi's shared actions: - - katepart KXMLGUIClient's KActions are now pluggable to KexiActionProxy - - KXMLGUIClient's KAction::enabled(bool) signals are now automatically mapped + - katepart KXMLGUIClient's TDEActions are now pluggable to KexiActionProxy + - KXMLGUIClient's TDEAction::enabled(bool) signals are now automatically mapped to KexiActionProxy::setAvailable(bool) <TODO>: introduce KexiSharedXMLGUIClient class: ctor: KexiSharedXMLGUIClient(KexiSharedActionHost *host, KXMLGUIClient *client). @@ -3786,7 +3786,7 @@ Core (ie. when given KexiViewBase object that is activated asks for this) and detached when not needed. showOnlyActions(QCStringList) - declares custom action list that will only be available - In any time, no KActions will be created if these already are available globally + In any time, no TDEActions will be created if these already are available globally within KexiMainWindow. </TODO> SQL View @@ -4298,7 +4298,7 @@ Main Window : some top level polishing -'save' action now works int the current dialog context -message about more not impelmented features added -proper quitting and project closing - -KMainWindow::queryExit() and queryClose() impelmented instad of closeEvent() + -TDEMainWindow::queryExit() and queryClose() impelmented instad of closeEvent() -"Create" menu is disabled when no project is loaded -On last dialog closing, guiclient is removed (so dead toolbar are hidden now) -Main Window: dock windows are disabled on project closing, for sanity @@ -5620,7 +5620,7 @@ TODO: add drag from browser - moving TableViews back from outside of scroll view area automatically shrinks scroll view's area to smallest possible size - field that we drag over now is highlighted -TODO: fix KListView::viewportPaintEvent() like in KexiRelationViewTable::drawItemHighlighter() +TODO: fix TDEListView::viewportPaintEvent() like in KexiRelationViewTable::drawItemHighlighter() and commit to cvs (tdeui) - KexiRelationViewTableContainer got now focus/unfocus/z-order functionality. Colors of table headers are consistent with focusing and OS settings @@ -5651,7 +5651,7 @@ TODO: like above: "Print" and "Print to" 2003-07-18 - " " prepended to Project Browsers' list items' texts for better look (maybe add this feature - to KListView or make its generic subclass?) + to TDEListView or make its generic subclass?) - Some fixes with text positioning in tableview cells: float and date type y-offset, date type editor frames removed TODO: maybe optionally use KDateWidget (this needs to extend and improve this class)? @@ -5683,13 +5683,13 @@ TODO: move this submenu after 'Error report' Entry (requires changes to koffice_ - project browser's groups items (tables, queries,..) are now non-selectable as these are rather special constant containers - added convenient hidden(), shown() signals to KexiDialogBase -- added KexiDialogBase::plugToggleAction(KToggleAction *toggle_action) for syncing window +- added KexiDialogBase::plugToggleAction(TDEToggleAction *toggle_action) for syncing window visibility with toggle action's state 2003-07-15 - Kexi/win32 synced with cvs again after plugins/ rearrangement. - New Kexi icon updated for win32 -- menubar and popupmenu entries in Query Part merged using KexiPartItemAction (new KAction subclass); +- menubar and popupmenu entries in Query Part merged using KexiPartItemAction (new TDEAction subclass); The same for Tables Part. KexiPartPopupMenu now collaborates with KexiPartItemAction to reuse its action's information (avoid redundancy). TODO: add delete_item action icon (equal "button_cancel" in crystalsvg) to the koffice/actions icons diff --git a/kexi/doc/dev/TODO-Kexi-js b/kexi/doc/dev/TODO-Kexi-js index 98582bfc..d7274acb 100644 --- a/kexi/doc/dev/TODO-Kexi-js +++ b/kexi/doc/dev/TODO-Kexi-js @@ -256,7 +256,7 @@ I am using update_kexi_po to recreate kexi.po file. THis will run cd koffice/ && - signal on situation when user e.g. pressed alpha key when only numeric chars is allowed - signal when null/empty value forcell isn't permitted - signal when repeated value isn't permitted - - add support for cut, copy & paste of cell's contents (get shortcuts from KStdAccel) + - add support for cut, copy & paste of cell's contents (get shortcuts from TDEStdAccel) HINT: removing Qt::WStaticContents from KexiTableView ctor fixed repaint problem the problem was with repainting when hscrollbar disapperars.... - KexiTableView loads all data from the table: very slow and consumes a lot of memory: @@ -269,7 +269,7 @@ HINT: removing Qt::WStaticContents from KexiTableView ctor fixed repaint problem - add more cell types & options: http://mfc.dundas.com/mfc/grid/index.aspx?section=Grid&body=celltypes.htm --including: red corner with a note; sliders; radio buttons -- highlight sorted column's cells slightly darker, like in current KListView's impl. +- highlight sorted column's cells slightly darker, like in current TDEListView's impl. - clicking on a header section (to sort), it ensures current cell is visible, but only y-position should be changed, not x - add support for crossed out rows - that can be used for results of DELETE queries @@ -344,7 +344,7 @@ HINT: removing Qt::WStaticContents from KexiTableView ctor fixed repaint problem - KTextEdit doesn't allow to set custom cursor (also in Qt Designer) - support for multiple widgets selection in the property editor (requires changes to kexiproperty) - handle older and newer formats in FormIO::loadFormFromDom() -- KAcceleratorManager::setNoAccel(QWidget*) - use it in data mode, +- TDEAcceleratorManager::setNoAccel(QWidget*) - use it in data mode, define "auto accels" form's property and if it's false - find a way to create more meaningfull default names for widgets than button1, button2. Maybe convert widget text (if available) using string2Identifier()? diff --git a/kexi/doc/plan/kexi-announce.txt b/kexi/doc/plan/kexi-announce.txt index 4975fff7..ea12380b 100644 --- a/kexi/doc/plan/kexi-announce.txt +++ b/kexi/doc/plan/kexi-announce.txt @@ -34,7 +34,7 @@ * It (will be) still properly integrated with other KOffice compontents (KWord mailmerge, KChart graphs, Kugar reports, KSpread tables ...) and/or reuse them -* Work on moving Kexi-as-KoMainWindow/KoDocument-driven application to Kexi-as-KMainWindow/KexiDB-driven application is stared by Kexi Team +* Work on moving Kexi-as-KoMainWindow/KoDocument-driven application to Kexi-as-TDEMainWindow/KexiDB-driven application is stared by Kexi Team %%% diff --git a/kexi/formeditor/TODO b/kexi/formeditor/TODO index 611d5c0c..bb435414 100644 --- a/kexi/formeditor/TODO +++ b/kexi/formeditor/TODO @@ -1,6 +1,6 @@ ^^^^^^^^^^^^^^^ IMPORTANT ^^^^^^^^^^^^^^^^^^^^^^ **** New Features : ****** -* KMainWindow support : Make an action editor + a toolbar editor (as in MozillaFirebird ?) + a menu editor +* TDEMainWindow support : Make an action editor + a toolbar editor (as in MozillaFirebird ?) + a menu editor (see Gambas and askk other devs if they already have done this) * Automatically set label name to the text * Create an event editor and manage signals/slots (EventBuffer ?) @@ -61,6 +61,6 @@ * Manage label buddies using a popup menu (24/05/04) * dragging with CTRL key can cause object's copying (25/05/04) * Create a PixmapCollection with an editor which allow to choose pixmaps by path or from KDE icons, no inline saving of pixmaps (9/06/04) -* Make actions toggable (with KToggleAction) (js 11/06/04) +* Make actions toggable (with TDEToggleAction) (js 11/06/04) * Make FormWidget pure virtual (17/06/04) * Resize label to fit the text (22/06/04) diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp index 929624ab..fece5065 100644 --- a/kexi/formeditor/commands.cpp +++ b/kexi/formeditor/commands.cpp @@ -748,7 +748,7 @@ InsertWidgetCommand::execute() //! @todo allow setting this for data view mode as well if (m_form->designMode()) { //don't generate accelerators for widgets in design mode - KAcceleratorManager::setNoAccel(w); + TDEAcceleratorManager::setNoAccel(w); } #endif @@ -902,7 +902,7 @@ CreateLayoutCommand::execute() if (w) { if (m_form->designMode()) { //don't generate accelerators for widgets in design mode - KAcceleratorManager::setNoAccel(w); + TDEAcceleratorManager::setNoAccel(w); } } #endif diff --git a/kexi/formeditor/editlistviewdialog.cpp b/kexi/formeditor/editlistviewdialog.cpp index 281e5604..0287135e 100644 --- a/kexi/formeditor/editlistviewdialog.cpp +++ b/kexi/formeditor/editlistviewdialog.cpp @@ -87,7 +87,7 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent) vlayout->addStretch(); //// The listview /////////// - m_listview = new KListView(m_contents, "editlistview_listview"); + m_listview = new TDEListView(m_contents, "editlistview_listview"); m_listview->setItemsRenameable(true); m_listview->setItemsMovable(true); m_listview->setDragEnabled(true); @@ -148,7 +148,7 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent) vbox->addStretch(); // The listbox with columns name ///// - m_listbox = new KListBox(m_column, "editlistview_columns"); + m_listbox = new TDEListBox(m_column, "editlistview_columns"); m_listbox->setFocus(); hbox->insertWidget(0, m_listbox); hbox->addWidget(m_editor); @@ -364,12 +364,12 @@ void EditListViewDialog::loadChildNodes(TQListView *listview, TQListViewItem *item, TQListViewItem *parent) { TQListViewItem *newItem; - if(listview->inherits("KListView")) + if(listview->inherits("TDEListView")) { if(parent) - newItem = new KListViewItem(parent); + newItem = new TDEListViewItem(parent); else - newItem = new KListViewItem(listview); + newItem = new TDEListViewItem(listview); } else { @@ -406,14 +406,14 @@ EditListViewDialog::loadChildNodes(TQListView *listview, TQListViewItem *item, T void EditListViewDialog::newRow() { - KListViewItem *parent = (KListViewItem*)m_listview->selectedItem(); + TDEListViewItem *parent = (TDEListViewItem*)m_listview->selectedItem(); if(parent) - parent = (KListViewItem*)parent->parent(); - KListViewItem *item; + parent = (TDEListViewItem*)parent->parent(); + TDEListViewItem *item; if(parent) - item = new KListViewItem(parent, m_listview->selectedItem()); + item = new TDEListViewItem(parent, m_listview->selectedItem()); else - item = new KListViewItem(m_listview, m_listview->selectedItem()); + item = new TDEListViewItem(m_listview, m_listview->selectedItem()); item->setText(0, i18n("New Item")); m_listview->setCurrentItem(item); } @@ -421,12 +421,12 @@ EditListViewDialog::newRow() void EditListViewDialog::newChildRow() { - KListViewItem *parent = (KListViewItem*)m_listview->currentItem(); - KListViewItem *item; + TDEListViewItem *parent = (TDEListViewItem*)m_listview->currentItem(); + TDEListViewItem *item; if(parent) - item = new KListViewItem(parent); + item = new TDEListViewItem(parent); else - item = new KListViewItem(m_listview, m_listview->currentItem()); + item = new TDEListViewItem(m_listview, m_listview->currentItem()); item->setText(0, i18n("Sub Item")); m_listview->setCurrentItem(item); diff --git a/kexi/formeditor/editlistviewdialog.h b/kexi/formeditor/editlistviewdialog.h index 0eb3017b..cfbaadbb 100644 --- a/kexi/formeditor/editlistviewdialog.h +++ b/kexi/formeditor/editlistviewdialog.h @@ -27,9 +27,9 @@ class TQFrame; class TQListView; class TQListViewItem; -class KListViewItem; -class KListView; -class KListBox; +class TDEListViewItem; +class TDEListView; +class TDEListBox; class TQListBoxItem; namespace KoProperty { @@ -40,12 +40,12 @@ namespace KoProperty { namespace KFormDesigner { -//! A dialog to edit the contents of a listvuew (KListView or TQListView) +//! A dialog to edit the contents of a listvuew (TDEListView or TQListView) /*! The dialog contains two pages, one to edit columns and one to edit ist items. KoProperty::Editor is used in columns to edit column properties (there are two properties not supported by TQt Designer: 'width' and 'resizable'). The user can enter list contents inside the list - using KListViewItem::setRenameable(). Pixmaps are not yet supported. */ + using TDEListViewItem::setRenameable(). Pixmaps are not yet supported. */ class KFORMEDITOR_EXPORT EditListViewDialog : public KDialogBase { Q_OBJECT @@ -84,8 +84,8 @@ class KFORMEDITOR_EXPORT EditListViewDialog : public KDialogBase KoProperty::Editor *m_editor; KoProperty::Set *m_propSet; TQFrame *m_contents, *m_column; - KListBox *m_listbox; - KListView *m_listview; + TDEListBox *m_listbox; + TDEListView *m_listview; TQIntDict<TQToolButton> m_buttons; }; diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp index be97d921..1669b329 100644 --- a/kexi/formeditor/factories/stdwidgetfactory.cpp +++ b/kexi/formeditor/factories/stdwidgetfactory.cpp @@ -217,7 +217,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin KFormDesigner::WidgetInfo *wListBox = new KFormDesigner::WidgetInfo(this); wListBox->setPixmap("listbox"); - wListBox->setClassName("KListBox"); + wListBox->setClassName("TDEListBox"); wListBox->addAlternateClassName(TQLISTBOX_OBJECT_NAME_STRING); wListBox->setIncludeFileName("klistbox.h"); wListBox->setName(i18n("List Box")); @@ -239,7 +239,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin KFormDesigner::WidgetInfo *wListView = new KFormDesigner::WidgetInfo(this); wListView->setPixmap("listview"); - wListView->setClassName("KListView"); + wListView->setClassName("TDEListView"); wListView->addAlternateClassName(TQLISTVIEW_OBJECT_NAME_STRING); wListView->setIncludeFileName("klistview.h"); wListView->setName(i18n("List View")); @@ -411,18 +411,18 @@ StdWidgetFactory::createWidget(const TQCString &c, TQWidget *p, const char *n, else if(c == "KComboBox") w = new KComboBox(p, n); - else if(c == "KListBox") - w = new KListBox(p, n); + else if(c == "TDEListBox") + w = new TDEListBox(p, n); else if(c == "KTextEdit") w = new KTextEdit(/*i18n("Enter your text here")*/text, TQString(), p, n); - else if(c == "KListView") + else if(c == "TDEListView") { - w = new KListView(p, n); + w = new TDEListView(p, n); if(container->form()->interactiveMode()) - ((KListView*)w)->addColumn(i18n("Column 1")); - ((KListView*)w)->setRootIsDecorated(true); + ((TDEListView*)w)->addColumn(i18n("Column 1")); + ((TDEListView*)w)->setRootIsDecorated(true); } else if(c == TQSLIDER_OBJECT_NAME_STRING) w = new TQSlider(Qt::Horizontal, p, n); @@ -475,7 +475,7 @@ StdWidgetFactory::createMenuActions(const TQCString &classname, TQWidget *, TQPo menu->insertItem(SmallIconSet("edit"), i18n("Edit Rich Text"), this, TQT_SLOT(editText())); return true; } - else if(classname == "KListView") + else if(classname == "TDEListView") { menu->insertItem(SmallIconSet("edit"), i18n("Edit Listview Contents"), this, TQT_SLOT(editListContents())); return true; @@ -538,12 +538,12 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes createEditor(classname, check->text(), check, container, editorRect, TQt::AlignAuto); return true; } - else if((classname == "KComboBox") || (classname == "KListBox")) + else if((classname == "KComboBox") || (classname == "TDEListBox")) { TQStringList list; - if(classname == "KListBox") + if(classname == "TDEListBox") { - KListBox *listbox = (KListBox*)w; + TDEListBox *listbox = (TDEListBox*)w; for(uint i=0; i < listbox->count(); i++) list.append(listbox->text(i)); } @@ -556,10 +556,10 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes if(editList(w, list)) { - if(classname == "KListBox") + if(classname == "TDEListBox") { - ((KListBox*)w)->clear(); - ((KListBox*)w)->insertStringList(list); + ((TDEListBox*)w)->clear(); + ((TDEListBox*)w)->insertStringList(list); } else if(classname == "KComboBox") { @@ -582,10 +582,10 @@ StdWidgetFactory::clearWidgetContent(const TQCString &classname, TQWidget *w) { if(classname == "KLineEdit") ((KLineEdit*)w)->clear(); - else if(classname == "KListBox") - ((KListBox*)w)->clear(); - else if(classname == "KListView") - ((KListView*)w)->clear(); + else if(classname == "TDEListBox") + ((TDEListBox*)w)->clear(); + else if(classname == "TDEListView") + ((TDEListView*)w)->clear(); else if(classname == "KComboBox") ((KComboBox*)w)->clear(); else if(classname == "KTextEdit") @@ -680,9 +680,9 @@ StdWidgetFactory::saveSpecialProperty(const TQCString &classname, const TQString } return true; } - else if(name == "list_items" && classname == "KListBox") + else if(name == "list_items" && classname == "TDEListBox") { - KListBox *listbox = (KListBox*)w; + TDEListBox *listbox = (TDEListBox*)w; for(uint i=0; i < listbox->count(); i++) { TQDomElement item = domDoc.createElement("item"); @@ -691,9 +691,9 @@ StdWidgetFactory::saveSpecialProperty(const TQCString &classname, const TQString } return true; } - else if(name == "list_contents" && classname == "KListView") + else if(name == "list_contents" && classname == "TDEListView") { - KListView *listview = (KListView*)w; + TDEListView *listview = (TDEListView*)w; // First we save the columns for(int i = 0; i < listview->columns(); i++) { @@ -755,9 +755,9 @@ StdWidgetFactory::readSpecialProperty(const TQCString &classname, TQDomElement & return true; } - if((tag == "item") && (classname == "KListBox")) + if((tag == "item") && (classname == "TDEListBox")) { - KListBox *listbox = (KListBox*)w; + TDEListBox *listbox = (TDEListBox*)w; TQVariant val = KFormDesigner::FormIO::readPropertyValue(node.firstChild().firstChild(), TQT_TQOBJECT(w), name); if(val.canCast(TQVariant::Pixmap)) listbox->insertItem(val.toPixmap()); @@ -766,9 +766,9 @@ StdWidgetFactory::readSpecialProperty(const TQCString &classname, TQDomElement & return true; } - if((tag == "column") && (classname == "KListView")) + if((tag == "column") && (classname == "TDEListView")) { - KListView *listview = (KListView*)w; + TDEListView *listview = (TDEListView*)w; int id=0; for(TQDomNode n = node.firstChild(); !n.isNull(); n = n.nextSibling()) { @@ -787,9 +787,9 @@ StdWidgetFactory::readSpecialProperty(const TQCString &classname, TQDomElement & } return true; } - else if((tag == "item") && (classname == "KListView")) + else if((tag == "item") && (classname == "TDEListView")) { - KListView *listview = (KListView*)w; + TDEListView *listview = (TDEListView*)w; readListItem(node, 0, listview); return true; } @@ -798,13 +798,13 @@ StdWidgetFactory::readSpecialProperty(const TQCString &classname, TQDomElement & } void -StdWidgetFactory::readListItem(TQDomElement &node, TQListViewItem *parent, KListView *listview) +StdWidgetFactory::readListItem(TQDomElement &node, TQListViewItem *parent, TDEListView *listview) { TQListViewItem *item; if(parent) - item = new KListViewItem(parent); + item = new TDEListViewItem(parent); else - item = new KListViewItem(listview); + item = new TDEListViewItem(listview); // We need to move the item at the end of the list TQListViewItem *last; @@ -919,9 +919,9 @@ StdWidgetFactory::autoSaveProperties(const TQCString &classname) l << "pixmap"; else if(classname == "KComboBox") l << "list_items"; - else if(classname == "KListBox") + else if(classname == "TDEListBox") l << "list_items"; - else if(classname == "KListView") + else if(classname == "TDEListView") l << "list_contents"; else if(classname == "Line") l << "orientation"; diff --git a/kexi/formeditor/factories/stdwidgetfactory.h b/kexi/formeditor/factories/stdwidgetfactory.h index a99bf6a8..32898782 100644 --- a/kexi/formeditor/factories/stdwidgetfactory.h +++ b/kexi/formeditor/factories/stdwidgetfactory.h @@ -92,7 +92,7 @@ class StdWidgetFactory : public KFormDesigner::WidgetFactory virtual bool changeText(const TQString &newText); virtual void resizeEditor(TQWidget *editor, TQWidget *widget, const TQCString &classname); void saveListItem(TQListViewItem *item, TQDomNode &parentNode, TQDomDocument &domDoc); - void readListItem(TQDomElement &node, TQListViewItem *parent, KListView *listview); + void readListItem(TQDomElement &node, TQListViewItem *parent, TDEListView *listview); private: // KFormDesigner::Container *m_container; diff --git a/kexi/formeditor/form.cpp b/kexi/formeditor/form.cpp index 52d44966..31344419 100644 --- a/kexi/formeditor/form.cpp +++ b/kexi/formeditor/form.cpp @@ -97,7 +97,7 @@ Form::Form(WidgetLibrary* library, const char *name, bool designMode) d->design = designMode; // Init actions - d->collection = new KActionCollection(0, this); + d->collection = new TDEActionCollection(0, this); d->history = new KCommandHistory(d->collection, true); connect(d->history, TQT_SIGNAL(commandExecuted()), this, TQT_SLOT(slotCommandExecuted())); connect(d->history, TQT_SIGNAL(documentRestored()), this, TQT_SLOT(slotFormRestored())); @@ -321,11 +321,11 @@ Form::emitActionSignals(bool withUndoAction) if(!withUndoAction) return; - KAction *undoAction = d->collection->action("edit_undo"); + TDEAction *undoAction = d->collection->action("edit_undo"); if(undoAction) FormManager::self()->emitUndoEnabled(undoAction->isEnabled(), undoAction->text()); - KAction *redoAction = d->collection->action("edit_redo"); + TDEAction *redoAction = d->collection->action("edit_redo"); if(redoAction) FormManager::self()->emitRedoEnabled(redoAction->isEnabled(), redoAction->text()); } @@ -428,7 +428,7 @@ Form::slotCommandExecuted() void Form::emitUndoEnabled() { - KAction *undoAction = d->collection->action("edit_undo"); + TDEAction *undoAction = d->collection->action("edit_undo"); if(undoAction) FormManager::self()->emitUndoEnabled(undoAction->isEnabled(), undoAction->text()); } @@ -436,7 +436,7 @@ Form::emitUndoEnabled() void Form::emitRedoEnabled() { - KAction *redoAction = d->collection->action("edit_redo"); + TDEAction *redoAction = d->collection->action("edit_redo"); if(redoAction) FormManager::self()->emitRedoEnabled(redoAction->isEnabled(), redoAction->text()); } diff --git a/kexi/formeditor/form.h b/kexi/formeditor/form.h index 084e7d20..7f79cf79 100644 --- a/kexi/formeditor/form.h +++ b/kexi/formeditor/form.h @@ -31,7 +31,7 @@ class TQWidget; class TQDomElement; -class KActionCollection; +class TDEActionCollection; class KCommandHistory; class KCommand; class PixmapCollection; @@ -101,7 +101,7 @@ class FormPrivate TQString filename; KCommandHistory *history; - KActionCollection *collection; + TDEActionCollection *collection; ObjectTreeList tabstops; bool autoTabstops; diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp index f90efddd..993b2451 100644 --- a/kexi/formeditor/formIO.cpp +++ b/kexi/formeditor/formIO.cpp @@ -1201,7 +1201,7 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *paren //! @todo allow setting this for data view mode as well if (m_currentForm->designMode()) { //don't generate accelerators for widgets in design mode - KAcceleratorManager::setNoAccel(w); + TDEAcceleratorManager::setNoAccel(w); } #endif w->setStyle(&(container->widget()->style())); diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp index f9849c35..284ce405 100644 --- a/kexi/formeditor/formmanager.cpp +++ b/kexi/formeditor/formmanager.cpp @@ -192,7 +192,7 @@ FormManager::setObjectTreeView(ObjectTreeView *treeview) } ActionList -FormManager::createActions(WidgetLibrary *lib, KActionCollection* collection, KXMLGUIClient* client) +FormManager::createActions(WidgetLibrary *lib, TDEActionCollection* collection, KXMLGUIClient* client) { m_collection = collection; @@ -201,8 +201,8 @@ FormManager::createActions(WidgetLibrary *lib, KActionCollection* collection, KX if (m_options & HideSignalSlotConnections) m_dragConnection = 0; else { - m_dragConnection = new KToggleAction(i18n("Connect Signals/Slots"), - "signalslot", KShortcut(0), this, TQT_SLOT(startCreatingConnection()), m_collection, + m_dragConnection = new TDEToggleAction(i18n("Connect Signals/Slots"), + "signalslot", TDEShortcut(0), this, TQT_SLOT(startCreatingConnection()), m_collection, "drag_connection"); //to be exclusive with any 'widget' action m_dragConnection->setExclusiveGroup("LibActionWidgets"); @@ -210,19 +210,19 @@ FormManager::createActions(WidgetLibrary *lib, KActionCollection* collection, KX actions.append(m_dragConnection); } - m_pointer = new KToggleAction(i18n("Pointer"), "mouse_pointer", KShortcut(0), + m_pointer = new TDEToggleAction(i18n("Pointer"), "mouse_pointer", TDEShortcut(0), this, TQT_SLOT(slotPointerClicked()), m_collection, "pointer"); m_pointer->setExclusiveGroup("LibActionWidgets"); //to be exclusive with any 'widget' action m_pointer->setChecked(true); actions.append(m_pointer); - m_snapToGrid = new KToggleAction(i18n("Snap to Grid"), TQString(), KShortcut(0), + m_snapToGrid = new TDEToggleAction(i18n("Snap to Grid"), TQString(), TDEShortcut(0), 0, 0, m_collection, "snap_to_grid"); m_snapToGrid->setChecked(true); actions.append(m_snapToGrid); // Create the Style selection action (with a combo box in toolbar and submenu items) - KSelectAction *m_style = new KSelectAction( i18n("Style"), KShortcut(0), + TDESelectAction *m_style = new TDESelectAction( i18n("Style"), TDEShortcut(0), this, TQT_SLOT(slotStyle()), m_collection, "change_style"); m_style->setEditable(false); @@ -501,7 +501,7 @@ FormManager::windowChanged(TQWidget *w) { #ifndef KFD_NO_STYLES // update the 'style' action - KSelectAction *m_style = (KSelectAction*)m_collection->action("change_style", "KSelectAction"); + TDESelectAction *m_style = (TDESelectAction*)m_collection->action("change_style", "TDESelectAction"); const TQString currentStyle = form->widget()->style().name(); const TQStringList styles = m_style->items(); @@ -544,7 +544,7 @@ FormManager::windowChanged(TQWidget *w) { #ifndef KFD_NO_STYLES // update the 'style' action - KSelectAction *m_style = (KSelectAction*)m_collection->action("change_style", "KSelectAction"); + TDESelectAction *m_style = (TDESelectAction*)m_collection->action("change_style", "TDESelectAction"); const TQString currentStyle = form->widget()->style().name(); const TQStringList styles = m_style->items(); @@ -787,7 +787,7 @@ FormManager::setInsertPoint(const TQPoint &p) void FormManager::createSignalMenu(TQWidget *w) { - m_sigSlotMenu = new KPopupMenu(); + m_sigSlotMenu = new TDEPopupMenu(); m_sigSlotMenu->insertTitle(SmallIcon("connection"), i18n("Signals")); TQStrList list = w->metaObject()->signalNames(true); @@ -808,7 +808,7 @@ FormManager::createSignalMenu(TQWidget *w) void FormManager::createSlotMenu(TQWidget *w) { - m_sigSlotMenu = new KPopupMenu(); + m_sigSlotMenu = new TDEPopupMenu(); m_sigSlotMenu->insertTitle(SmallIcon("connection"), i18n("Slots")); TQString signalArg( m_connection->signal().remove( TQRegExp(".*[(]|[)]") ) ); @@ -853,7 +853,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu // TQValueVector<int> menuIds(); if (!m_popup) { - m_popup = new KPopupMenu(); + m_popup = new TDEPopupMenu(); } else { m_popup->clear(); @@ -872,7 +872,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu m_popup->insertTitle(SmallIcon("multiple_obj"), i18n("Multiple Widgets") + TQString(" (%1)").arg(widgetsCount)); - KAction *a; + TDEAction *a; #define PLUG_ACTION(_name, forceVisible) \ { a = action(_name); \ if (a && (forceVisible || a->isEnabled())) { \ @@ -903,7 +903,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu if (separatorNeeded) m_popup->insertSeparator(); - KPopupMenu *sub = new KPopupMenu(w); + TDEPopupMenu *sub = new TDEPopupMenu(w); TQWidget *buddy = ((TQLabel*)w)->buddy(); sub->insertItem(i18n("No Buddy"), MenuNoBuddy); @@ -936,7 +936,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu m_popup->insertSeparator(); // We create the signals menu - KPopupMenu *sigMenu = new KPopupMenu(); + TDEPopupMenu *sigMenu = new TDEPopupMenu(); TQStrList list = w->metaObject()->signalNames(true); TQStrListIterator it(list); for(; it.current() != 0; ++it) @@ -1206,7 +1206,7 @@ FormManager::slotStyle() if(!activeForm()) return; - KSelectAction *m_style = (KSelectAction*)m_collection->action("change_style", "KSelectAction"); + TDESelectAction *m_style = (TDESelectAction*)m_collection->action("change_style", "TDESelectAction"); TQString style = m_style->currentText(); activeForm()->widget()->setStyle( style ); @@ -1684,26 +1684,26 @@ FormManager::changeFont() //single widget's settings widget = widgetsWithFontProperty.first(); KoProperty::Property &fontProp = m_propSet->property("font"); - if (TQDialog::Accepted != KFontDialog::getFont(font, false, m_active->widget())) + if (TQDialog::Accepted != TDEFontDialog::getFont(font, false, m_active->widget())) return; fontProp = font; return; } //multiple widgets int diffFlags=0; - if (TQDialog::Accepted != KFontDialog::getFontDiff(font, diffFlags, false, m_active->widget()) + if (TQDialog::Accepted != TDEFontDialog::getFontDiff(font, diffFlags, false, m_active->widget()) || 0==diffFlags) return; //update font for (WidgetListIterator it(widgetsWithFontProperty); (widget = it.current()); ++it) { TQFont prevFont( widget->font() ); - if (diffFlags & KFontChooser::FontDiffFamily) + if (diffFlags & TDEFontChooser::FontDiffFamily) prevFont.setFamily( font.family() ); - if (diffFlags & KFontChooser::FontDiffStyle) { + if (diffFlags & TDEFontChooser::FontDiffStyle) { prevFont.setBold( font.bold() ); prevFont.setItalic( font.italic() ); } - if (diffFlags & KFontChooser::FontDiffSize) + if (diffFlags & TDEFontChooser::FontDiffSize) prevFont.setPointSize( font.pointSize() ); /*! @todo this modification is not added to UNDO BUFFER: do it when KoProperty::Set supports multiple selections */ diff --git a/kexi/formeditor/formmanager.h b/kexi/formeditor/formmanager.h index 39006a7b..036bf90e 100644 --- a/kexi/formeditor/formmanager.h +++ b/kexi/formeditor/formmanager.h @@ -30,14 +30,14 @@ class TQWidget; class TQWorkspace; -class KPopupMenu; -class KActionCollection; -class KAction; -class KToggleAction; +class TDEPopupMenu; +class TDEActionCollection; +class TDEAction; +class TDEToggleAction; class KDialogBase; class KTextEdit; class KXMLGUIClient; -class KMainWindow; +class TDEMainWindow; namespace KoProperty { class Editor; @@ -55,7 +55,7 @@ class WidgetLibrary; class ObjectTreeView; class Connection; class FormManager; -typedef TQPtrList<KAction> ActionList; +typedef TQPtrList<TDEAction> ActionList; //! @internal //static FormManager* FormManager_static = 0; @@ -95,13 +95,13 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject enum Options { HideEventsInPopupMenu = 1, SkipFileActions = 2, HideSignalSlotConnections = 4 }; //todo - /*! Creates all the KActions related to widget insertion, and plug them + /*! Creates all the TDEActions related to widget insertion, and plug them into the \a collection. \a client XML GUI client is used to call lib->addCustomWidgetActions(client). These actions are automatically connected to \ref insertWidget() slot. \return a TQPtrList of the created actions. */ - ActionList createActions(WidgetLibrary *lib, KActionCollection* collection, KXMLGUIClient *client); + ActionList createActions(WidgetLibrary *lib, TDEActionCollection* collection, KXMLGUIClient *client); /*! Enables or disables actions \a name. KFD uses KPart's, action collection here. @@ -109,7 +109,7 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject virtual void enableAction( const char* name, bool enable ) = 0; /*! \return action for \a name. @see enableAction() */ - virtual KAction* action(const char* name) = 0; + virtual TDEAction* action(const char* name) = 0; bool isPasteEnabled(); @@ -453,7 +453,7 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject // Copy/Paste TQDomDocument m_domDoc; - KPopupMenu *m_popup; + TDEPopupMenu *m_popup; TQPoint m_insertPoint; TQGuardedPtr<TQWidget> m_menuWidget; @@ -464,11 +464,11 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject // Connection stuff bool m_drawingSlot; Connection *m_connection; - KPopupMenu *m_sigSlotMenu; + TDEPopupMenu *m_sigSlotMenu; // Actions - KActionCollection *m_collection; - KToggleAction *m_pointer, *m_dragConnection, *m_snapToGrid; + TDEActionCollection *m_collection; + TDEToggleAction *m_pointer, *m_dragConnection, *m_snapToGrid; //! Used to delayed widgets deletion TQTimer m_deleteWidgetLater_timer; diff --git a/kexi/formeditor/libactionwidget.cpp b/kexi/formeditor/libactionwidget.cpp index 0edc2433..4322ad18 100644 --- a/kexi/formeditor/libactionwidget.cpp +++ b/kexi/formeditor/libactionwidget.cpp @@ -25,8 +25,8 @@ using namespace KFormDesigner; -LibActionWidget::LibActionWidget(WidgetInfo *w, KActionCollection *c) - : KToggleAction(w->name(), w->pixmap(), 0/*Key_F5*/, 0, 0 /*TQT_SLOT(slotWidget())*/, +LibActionWidget::LibActionWidget(WidgetInfo *w, TDEActionCollection *c) + : TDEToggleAction(w->name(), w->pixmap(), 0/*Key_F5*/, 0, 0 /*TQT_SLOT(slotWidget())*/, c, TQString("library_widget_" + w->className()).latin1()) { // kdDebug() << "LibActionWidget::LibActionWidget(): " << TQString("library_widget_" + w->className()).latin1() << endl; @@ -40,7 +40,7 @@ LibActionWidget::LibActionWidget(WidgetInfo *w, KActionCollection *c) void LibActionWidget::slotActivated() { - KToggleAction::slotActivated(); + TDEToggleAction::slotActivated(); if (isChecked()) emit prepareInsert(m_className); } diff --git a/kexi/formeditor/libactionwidget.h b/kexi/formeditor/libactionwidget.h index 8247d69c..c546ac9d 100644 --- a/kexi/formeditor/libactionwidget.h +++ b/kexi/formeditor/libactionwidget.h @@ -30,16 +30,16 @@ namespace KFormDesigner class WidgetInfo; /** - * KToggleAction subclass which remembers the matching class name. + * TDEToggleAction subclass which remembers the matching class name. */ -class KFORMEDITOR_EXPORT LibActionWidget : public KToggleAction +class KFORMEDITOR_EXPORT LibActionWidget : public TDEToggleAction { Q_OBJECT public: /** LibActionWidget object is initialized to be mutually exclusive with all other LibActionWidget objects */ - LibActionWidget(WidgetInfo *, KActionCollection *collection); + LibActionWidget(WidgetInfo *, TDEActionCollection *collection); virtual ~LibActionWidget(); signals: @@ -49,7 +49,7 @@ class KFORMEDITOR_EXPORT LibActionWidget : public KToggleAction void prepareInsert(const TQCString &className); protected slots: - /** reimplemented from KToggleAction */ + /** reimplemented from TDEToggleAction */ virtual void slotActivated(); private: diff --git a/kexi/formeditor/objecttreeview.cpp b/kexi/formeditor/objecttreeview.cpp index 82cb67bb..5146576c 100644 --- a/kexi/formeditor/objecttreeview.cpp +++ b/kexi/formeditor/objecttreeview.cpp @@ -35,13 +35,13 @@ using namespace KFormDesigner; ObjectTreeViewItem::ObjectTreeViewItem(ObjectTreeViewItem *parent, ObjectTreeItem *item) - : KListViewItem(parent, item->name(), item->className()) + : TDEListViewItem(parent, item->name(), item->className()) { m_item = item; } -ObjectTreeViewItem::ObjectTreeViewItem(KListView *list, ObjectTreeItem *item) - : KListViewItem(list, item ? item->name() : TQString(), item ? item->className() : TQString()) +ObjectTreeViewItem::ObjectTreeViewItem(TDEListView *list, ObjectTreeItem *item) + : TDEListViewItem(list, item ? item->name() : TQString(), item ? item->className() : TQString()) { m_item = item; } @@ -67,7 +67,7 @@ ObjectTreeViewItem::paintCell(TQPainter *p, const TQColorGroup & cg, int column, { if(!m_item) return; - KListViewItem::paintCell(p, cg, column, width, align); + TDEListViewItem::paintCell(p, cg, column, width, align); } else { @@ -148,7 +148,7 @@ ObjectTreeViewItem::paintBranches(TQPainter *p, const TQColorGroup &cg, int w, i void ObjectTreeViewItem::setup() { - KListViewItem::setup(); + TDEListViewItem::setup(); if(!m_item) setHeight(0); } @@ -158,13 +158,13 @@ ObjectTreeViewItem::setOpen( bool o ) { //don't allow to collapse the node, user may be tricked because we're not displaying [+] marks if (o) - KListViewItem::setOpen(o); + TDEListViewItem::setOpen(o); } // ObjectTreeView itself ---------------- ObjectTreeView::ObjectTreeView(TQWidget *parent, const char *name, bool tabStop) - : KListView(parent, name) + : TDEListView(parent, name) , m_form(0) { addColumn(i18n("Name"), 130); @@ -177,7 +177,7 @@ ObjectTreeView::ObjectTreeView(TQWidget *parent, const char *name, bool tabStop) { setSelectionModeExt(Extended); connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); - connect(this, TQT_SIGNAL(contextMenu(KListView *, TQListViewItem *, const TQPoint&)), this, TQT_SLOT(displayContextMenu(KListView*, TQListViewItem*, const TQPoint&))); + connect(this, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint&)), this, TQT_SLOT(displayContextMenu(TDEListView*, TQListViewItem*, const TQPoint&))); } setFullWidth(true); @@ -194,7 +194,7 @@ TQSize ObjectTreeView::sizeHint() const { return TQSize( TQFontMetrics(font()).width(columnText(0)+columnText(1)+" "), - KListView::sizeHint().height()); + TDEListView::sizeHint().height()); } TQString @@ -210,7 +210,7 @@ ObjectTreeView::slotColumnSizeChanged(int) } void -ObjectTreeView::displayContextMenu(KListView *list, TQListViewItem *item, const TQPoint &) +ObjectTreeView::displayContextMenu(TDEListView *list, TQListViewItem *item, const TQPoint &) { if(list != this || !m_form || !item) return; diff --git a/kexi/formeditor/objecttreeview.h b/kexi/formeditor/objecttreeview.h index 1da1a398..e1b6932b 100644 --- a/kexi/formeditor/objecttreeview.h +++ b/kexi/formeditor/objecttreeview.h @@ -28,11 +28,11 @@ class ObjectTreeItem; class Form; //! @short An item in ObjectTreeView associated with an ObjectTreeItem. -class KFORMEDITOR_EXPORT ObjectTreeViewItem : public KListViewItem +class KFORMEDITOR_EXPORT ObjectTreeViewItem : public TDEListViewItem { public: ObjectTreeViewItem(ObjectTreeViewItem *parent, ObjectTreeItem *item); - ObjectTreeViewItem(KListView *list, ObjectTreeItem *item=0); + ObjectTreeViewItem(TDEListView *list, ObjectTreeItem *item=0); virtual ~ObjectTreeViewItem(); //! \return the item name, ie the ObjectTreeItem name @@ -60,11 +60,11 @@ class KFORMEDITOR_EXPORT ObjectTreeViewItem : public KListViewItem }; /*! @short A graphical view of Form's ObjectTree. - This is a KListView which represents an item for each widget in the form. + This is a TDEListView which represents an item for each widget in the form. The actually selected widget is written bold and selected. Clicking on a list item selects the corresponding widget in the Form. */ -class KFORMEDITOR_EXPORT ObjectTreeView : public KListView +class KFORMEDITOR_EXPORT ObjectTreeView : public TDEListView { Q_OBJECT @@ -101,7 +101,7 @@ class KFORMEDITOR_EXPORT ObjectTreeView : public KListView protected slots: /*! This slot is called when the user right-click a list item. The widget context menu is shown, as inisde the Form. */ - void displayContextMenu(KListView *list, TQListViewItem *item, const TQPoint &p); + void displayContextMenu(TDEListView *list, TQListViewItem *item, const TQPoint &p); void slotColumnSizeChanged(int); diff --git a/kexi/formeditor/richtextdialog.cpp b/kexi/formeditor/richtextdialog.cpp index a8605e7b..1461536d 100644 --- a/kexi/formeditor/richtextdialog.cpp +++ b/kexi/formeditor/richtextdialog.cpp @@ -40,11 +40,11 @@ RichTextDialog::RichTextDialog(TQWidget *parent, const TQString &text) TQVBoxLayout *l = new TQVBoxLayout(frame); l->setAutoAdd(true); - m_toolbar = new KToolBar(frame); + m_toolbar = new TDEToolBar(frame); m_toolbar->setFlat(true); m_toolbar->show(); - m_fcombo = new KFontCombo(m_toolbar); + m_fcombo = new TDEFontCombo(m_toolbar); m_toolbar->insertWidget(TBFont, 40, m_fcombo); connect(m_fcombo, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changeFont(const TQString &))); @@ -68,7 +68,7 @@ RichTextDialog::RichTextDialog(TQWidget *parent, const TQString &text) m_toolbar->setToggle(TBSub, true); m_toolbar->insertSeparator(); - KToolBarRadioGroup *group = new KToolBarRadioGroup(m_toolbar); + TDEToolBarRadioGroup *group = new TDEToolBarRadioGroup(m_toolbar); m_toolbar->insertButton("text_left", TBLeft, true, i18n("Left Align")); m_toolbar->setToggle(TBLeft, true); group->addButton(TBLeft); diff --git a/kexi/formeditor/richtextdialog.h b/kexi/formeditor/richtextdialog.h index 585e65df..366a1cd2 100644 --- a/kexi/formeditor/richtextdialog.h +++ b/kexi/formeditor/richtextdialog.h @@ -23,8 +23,8 @@ #include <kdialogbase.h> #include <ktextedit.h> -class KToolBar; -class KFontCombo; +class TDEToolBar; +class TDEFontCombo; class KColorCombo; namespace KFormDesigner { @@ -53,9 +53,9 @@ class KFORMEDITOR_EXPORT RichTextDialog : public KDialogBase private: enum { TBFont = 100, TBColor, TBBold, TBItalic, TBUnder, TBSuper, TBSub, TBLeft = 201, TBCenter, TBRight, TBJustify }; - KToolBar *m_toolbar; + TDEToolBar *m_toolbar; KTextEdit *m_edit; - KFontCombo *m_fcombo; + TDEFontCombo *m_fcombo; KColorCombo *m_colCombo; }; diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp index e6c09927..c897f243 100644 --- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp +++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp @@ -106,7 +106,7 @@ class KFDPart_FormManager : public KFormDesigner::FormManager { } - virtual KAction* action( const char* name) + virtual TDEAction* action( const char* name) { return m_part->actionCollection()->action( name ); } @@ -208,35 +208,35 @@ KFormDesignerKDevPart::setupActions() KStdAction::undo(KFormDesigner::FormManager::self(), TQT_SLOT(undo()), actionCollection()); KStdAction::redo(KFormDesigner::FormManager::self(), TQT_SLOT(redo()), actionCollection()); KStdAction::selectAll(KFormDesigner::FormManager::self(), TQT_SLOT(selectAll()), actionCollection()); - new KAction(i18n("Clear Widget Contents"), "editclear", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(clearWidgetContent()), actionCollection(), "clear_contents"); - new KAction(i18n("Delete Widget"), "editdelete", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(deleteWidget()), actionCollection(), "edit_delete"); - new KAction(i18n("Preview Form"), "filequickprint", "Ctrl+T", this, TQT_SLOT(slotPreviewForm()), actionCollection(), "preview_form"); - new KAction(i18n("Edit Tab Order"), "tab_order", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder()), actionCollection(), "taborder"); - new KAction(i18n("Edit Pixmap Collection"), "icons", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editFormPixmapCollection()), actionCollection(), "pixmap_collection"); - new KAction(i18n("Edit Form Connections"), "connections", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editConnections()), actionCollection(), "form_connections"); - - new KAction(i18n("Lay Out Widgets &Horizontally"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox"); - new KAction(i18n("Lay Out Widgets &Vertically"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox"); - new KAction(i18n("Lay Out Widgets in &Grid"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid"); - new KAction(i18n("&Break Layout"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout"); - - new KAction(i18n("Bring Widget to Front"), "raise", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(bringWidgetToFront()), actionCollection(), "format_raise"); - new KAction(i18n("Send Widget to Back"), "lower", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(sendWidgetToBack()), actionCollection(), "format_lower"); - - KActionMenu *alignMenu = new KActionMenu(i18n("Align Widgets' Positions"), "aopos2grid", actionCollection(), "align_menu"); - alignMenu->insert( new KAction(i18n("To Left"), "aoleft", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToLeft()), actionCollection(), "align_to_left") ); - alignMenu->insert( new KAction(i18n("To Right"), "aoright", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToRight()), actionCollection(), "align_to_right") ); - alignMenu->insert( new KAction(i18n("To Top"), "aotop", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToTop()), actionCollection(), "align_to_top") ); - alignMenu->insert( new KAction(i18n("To Bottom"), "aobottom", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToBottom()), actionCollection(), "align_to_bottom") ); - alignMenu->insert( new KAction(i18n("To Grid"), "aopos2grid", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToGrid()), actionCollection(), "align_to_grid") ); - - KActionMenu *sizeMenu = new KActionMenu(i18n("Adjust Widgets' Sizes"), "aogrid", actionCollection(), "adjust_size_menu"); - sizeMenu->insert( new KAction(i18n("To Fit"), "aofit", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidgetSize()), actionCollection(), "adjust_to_fit") ); - sizeMenu->insert( new KAction(i18n("To Grid"), "aogrid", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustSizeToGrid()), actionCollection(), "adjust_size_grid") ); - sizeMenu->insert( new KAction(i18n("To Shortest"), "aoshortest", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToSmall()), actionCollection(), "adjust_height_small") ); - sizeMenu->insert( new KAction(i18n("To Tallest"), "aotallest", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToBig()), actionCollection(), "adjust_height_big") ); - sizeMenu->insert( new KAction(i18n("To Narrowest"), "aonarrowest", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToSmall()), actionCollection(), "adjust_width_small") ); - sizeMenu->insert( new KAction(i18n("To Widest"), "aowidest", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToBig()), actionCollection(), "adjust_width_big") ); + new TDEAction(i18n("Clear Widget Contents"), "editclear", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(clearWidgetContent()), actionCollection(), "clear_contents"); + new TDEAction(i18n("Delete Widget"), "editdelete", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(deleteWidget()), actionCollection(), "edit_delete"); + new TDEAction(i18n("Preview Form"), "filequickprint", "Ctrl+T", this, TQT_SLOT(slotPreviewForm()), actionCollection(), "preview_form"); + new TDEAction(i18n("Edit Tab Order"), "tab_order", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder()), actionCollection(), "taborder"); + new TDEAction(i18n("Edit Pixmap Collection"), "icons", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editFormPixmapCollection()), actionCollection(), "pixmap_collection"); + new TDEAction(i18n("Edit Form Connections"), "connections", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editConnections()), actionCollection(), "form_connections"); + + new TDEAction(i18n("Lay Out Widgets &Horizontally"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox"); + new TDEAction(i18n("Lay Out Widgets &Vertically"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox"); + new TDEAction(i18n("Lay Out Widgets in &Grid"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid"); + new TDEAction(i18n("&Break Layout"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout"); + + new TDEAction(i18n("Bring Widget to Front"), "raise", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(bringWidgetToFront()), actionCollection(), "format_raise"); + new TDEAction(i18n("Send Widget to Back"), "lower", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(sendWidgetToBack()), actionCollection(), "format_lower"); + + TDEActionMenu *alignMenu = new TDEActionMenu(i18n("Align Widgets' Positions"), "aopos2grid", actionCollection(), "align_menu"); + alignMenu->insert( new TDEAction(i18n("To Left"), "aoleft", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToLeft()), actionCollection(), "align_to_left") ); + alignMenu->insert( new TDEAction(i18n("To Right"), "aoright", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToRight()), actionCollection(), "align_to_right") ); + alignMenu->insert( new TDEAction(i18n("To Top"), "aotop", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToTop()), actionCollection(), "align_to_top") ); + alignMenu->insert( new TDEAction(i18n("To Bottom"), "aobottom", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToBottom()), actionCollection(), "align_to_bottom") ); + alignMenu->insert( new TDEAction(i18n("To Grid"), "aopos2grid", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToGrid()), actionCollection(), "align_to_grid") ); + + TDEActionMenu *sizeMenu = new TDEActionMenu(i18n("Adjust Widgets' Sizes"), "aogrid", actionCollection(), "adjust_size_menu"); + sizeMenu->insert( new TDEAction(i18n("To Fit"), "aofit", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidgetSize()), actionCollection(), "adjust_to_fit") ); + sizeMenu->insert( new TDEAction(i18n("To Grid"), "aogrid", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustSizeToGrid()), actionCollection(), "adjust_size_grid") ); + sizeMenu->insert( new TDEAction(i18n("To Shortest"), "aoshortest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToSmall()), actionCollection(), "adjust_height_small") ); + sizeMenu->insert( new TDEAction(i18n("To Tallest"), "aotallest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToBig()), actionCollection(), "adjust_height_big") ); + sizeMenu->insert( new TDEAction(i18n("To Narrowest"), "aonarrowest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToSmall()), actionCollection(), "adjust_width_small") ); + sizeMenu->insert( new TDEAction(i18n("To Widest"), "aowidest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToBig()), actionCollection(), "adjust_width_big") ); if(m_inShell) setXMLFile("kformdesigner_part_shell.rc"); @@ -495,7 +495,7 @@ KFormDesignerKDevPart::disableWidgetActions() void KFormDesignerKDevPart::setUndoEnabled(bool enabled, const TQString &text) { - KAction *undoAction = actionCollection()->action("edit_undo"); + TDEAction *undoAction = actionCollection()->action("edit_undo"); if(undoAction) { undoAction->setEnabled(enabled); @@ -507,7 +507,7 @@ KFormDesignerKDevPart::setUndoEnabled(bool enabled, const TQString &text) void KFormDesignerKDevPart::setRedoEnabled(bool enabled, const TQString &text) { - KAction *redoAction = actionCollection()->action("edit_redo"); + TDEAction *redoAction = actionCollection()->action("edit_redo"); if(redoAction) { redoAction->setEnabled(enabled); diff --git a/kexi/formeditor/tdevelop_plugin/kformdesigner_part.rc b/kexi/formeditor/tdevelop_plugin/kformdesigner_part.rc index 3cadda53..38ab2ee4 100644 --- a/kexi/formeditor/tdevelop_plugin/kformdesigner_part.rc +++ b/kexi/formeditor/tdevelop_plugin/kformdesigner_part.rc @@ -42,9 +42,9 @@ <Action name="library_widget_QCheckBox"/> <Action name="library_widget_KIntSpinBox"/> <Action name="library_widget_KComboBox"/> - <Action name="library_widget_KListBox"/> + <Action name="library_widget_TDEListBox"/> <Action name="library_widget_KTextEdit"/> - <Action name="library_widget_KListView"/> + <Action name="library_widget_TDEListView"/> <Action name="library_widget_QSlider"/> <Action name="library_widget_KProgress"/> <Action name="library_widget_KTimeWidget"/> @@ -103,9 +103,9 @@ <Action name="library_widget_QCheckBox"/> <Action name="library_widget_KIntSpinBox"/> <Action name="library_widget_KComboBox"/> - <Action name="library_widget_KListBox"/> + <Action name="library_widget_TDEListBox"/> <Action name="library_widget_KTextEdit"/> - <Action name="library_widget_KListView"/> + <Action name="library_widget_TDEListView"/> <Action name="library_widget_QSlider"/> <Action name="library_widget_KProgress"/> <Action name="library_widget_KTimeWidget"/> diff --git a/kexi/formeditor/tdevelop_plugin/kformdesigner_part_shell.rc b/kexi/formeditor/tdevelop_plugin/kformdesigner_part_shell.rc index 8b592752..95916698 100644 --- a/kexi/formeditor/tdevelop_plugin/kformdesigner_part_shell.rc +++ b/kexi/formeditor/tdevelop_plugin/kformdesigner_part_shell.rc @@ -52,9 +52,9 @@ <Action name="library_widget_QCheckBox"/> <Action name="library_widget_KIntSpinBox"/> <Action name="library_widget_KComboBox"/> - <Action name="library_widget_KListBox"/> + <Action name="library_widget_TDEListBox"/> <Action name="library_widget_KTextEdit"/> - <Action name="library_widget_KListView"/> + <Action name="library_widget_TDEListView"/> <Action name="library_widget_QSlider"/> <Action name="library_widget_KProgress"/> <Action name="library_widget_KTimeWidget"/> @@ -116,9 +116,9 @@ <Action name="library_widget_QCheckBox"/> <Action name="library_widget_KIntSpinBox"/> <Action name="library_widget_KComboBox"/> - <Action name="library_widget_KListBox"/> + <Action name="library_widget_TDEListBox"/> <Action name="library_widget_KTextEdit"/> - <Action name="library_widget_KListView"/> + <Action name="library_widget_TDEListView"/> <Action name="library_widget_QSlider"/> <Action name="library_widget_KProgress"/> <Action name="library_widget_KTimeWidget"/> diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp index a6b24574..38d99e5a 100644 --- a/kexi/formeditor/test/kfd_part.cpp +++ b/kexi/formeditor/test/kfd_part.cpp @@ -68,7 +68,7 @@ class KFDPart_FormManager : public KFormDesigner::FormManager { } - virtual KAction* action( const char* name) + virtual TDEAction* action( const char* name) { return m_part->actionCollection()->action( name ); } @@ -212,48 +212,48 @@ KFormDesignerPart::setupActions() KStdAction::undo(KFormDesigner::FormManager::self(), TQT_SLOT(undo()), actionCollection()); KStdAction::redo(KFormDesigner::FormManager::self(), TQT_SLOT(redo()), actionCollection()); KStdAction::selectAll(KFormDesigner::FormManager::self(), TQT_SLOT(selectAll()), actionCollection()); - new KAction(i18n("Clear Widget Contents"), "editclear", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(clearWidgetContent()), actionCollection(), "clear_contents"); - new KAction(i18n("Delete Widget"), "editdelete", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(deleteWidget()), actionCollection(), "edit_delete"); - new KAction(i18n("Preview Form"), "filequickprint", CTRL+Key_T, this, TQT_SLOT(slotPreviewForm()), actionCollection(), "preview_form"); - new KAction(i18n("Edit Tab Order"), "tab_order", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder()), actionCollection(), "taborder"); - new KAction(i18n("Edit Pixmap Collection"), "icons", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editFormPixmapCollection()), actionCollection(), "pixmap_collection"); - new KAction(i18n("Edit Form Connections"), "connections", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editConnections()), actionCollection(), "form_connections"); - - KActionMenu *layoutMenu = new KActionMenu(i18n("Group Widgets"), "", actionCollection(), "layout_menu"); - layoutMenu->insert(new KAction(i18n("&Horizontally"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox")); - layoutMenu->insert(new KAction(i18n("&Vertically"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox")); - layoutMenu->insert(new KAction(i18n("In &Grid"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid")); - layoutMenu->insert(new KAction(i18n("By &Rows"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHFlow()), actionCollection(), "layout_hflow")); - layoutMenu->insert(new KAction(i18n("By &Columns"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVFlow()), actionCollection(), "layout_vflow")); - layoutMenu->insert(new KAction(i18n("Horizontally in &Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHSplitter()), actionCollection(), "layout_hsplitter")); - layoutMenu->insert(new KAction(i18n("Verti&cally in Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVSplitter()), actionCollection(), "layout_vsplitter")); - new KAction(i18n("&Ungroup Widgets"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout"); + new TDEAction(i18n("Clear Widget Contents"), "editclear", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(clearWidgetContent()), actionCollection(), "clear_contents"); + new TDEAction(i18n("Delete Widget"), "editdelete", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(deleteWidget()), actionCollection(), "edit_delete"); + new TDEAction(i18n("Preview Form"), "filequickprint", CTRL+Key_T, this, TQT_SLOT(slotPreviewForm()), actionCollection(), "preview_form"); + new TDEAction(i18n("Edit Tab Order"), "tab_order", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder()), actionCollection(), "taborder"); + new TDEAction(i18n("Edit Pixmap Collection"), "icons", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editFormPixmapCollection()), actionCollection(), "pixmap_collection"); + new TDEAction(i18n("Edit Form Connections"), "connections", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editConnections()), actionCollection(), "form_connections"); + + TDEActionMenu *layoutMenu = new TDEActionMenu(i18n("Group Widgets"), "", actionCollection(), "layout_menu"); + layoutMenu->insert(new TDEAction(i18n("&Horizontally"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox")); + layoutMenu->insert(new TDEAction(i18n("&Vertically"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox")); + layoutMenu->insert(new TDEAction(i18n("In &Grid"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid")); + layoutMenu->insert(new TDEAction(i18n("By &Rows"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHFlow()), actionCollection(), "layout_hflow")); + layoutMenu->insert(new TDEAction(i18n("By &Columns"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVFlow()), actionCollection(), "layout_vflow")); + layoutMenu->insert(new TDEAction(i18n("Horizontally in &Splitter"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHSplitter()), actionCollection(), "layout_hsplitter")); + layoutMenu->insert(new TDEAction(i18n("Verti&cally in Splitter"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVSplitter()), actionCollection(), "layout_vsplitter")); + new TDEAction(i18n("&Ungroup Widgets"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout"); /* - new KAction(i18n("Lay Out Widgets &Horizontally"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox"); - new KAction(i18n("Lay Out Widgets &Vertically"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox"); - new KAction(i18n("Lay Out Widgets in &Grid"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid"); - new KAction(i18n("Lay Out Widgets H&orizontally in Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHSplitter()), actionCollection(), "layout_hsplitter"); - new KAction(i18n("Lay Out Widgets Verti&cally in Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVSplitter()), actionCollection(), "layout_vsplitter"); - new KAction(i18n("&Break Layout"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout"); + new TDEAction(i18n("Lay Out Widgets &Horizontally"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox"); + new TDEAction(i18n("Lay Out Widgets &Vertically"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox"); + new TDEAction(i18n("Lay Out Widgets in &Grid"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid"); + new TDEAction(i18n("Lay Out Widgets H&orizontally in Splitter"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHSplitter()), actionCollection(), "layout_hsplitter"); + new TDEAction(i18n("Lay Out Widgets Verti&cally in Splitter"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVSplitter()), actionCollection(), "layout_vsplitter"); + new TDEAction(i18n("&Break Layout"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout"); */ - new KAction(i18n("Bring Widget to Front"), "raise", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(bringWidgetToFront()), actionCollection(), "format_raise"); - new KAction(i18n("Send Widget to Back"), "lower", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(sendWidgetToBack()), actionCollection(), "format_lower"); - - KActionMenu *alignMenu = new KActionMenu(i18n("Align Widgets' Positions"), "aopos2grid", actionCollection(), "align_menu"); - alignMenu->insert( new KAction(i18n("To Left"), "aoleft", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToLeft()), actionCollection(), "align_to_left") ); - alignMenu->insert( new KAction(i18n("To Right"), "aoright", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToRight()), actionCollection(), "align_to_right") ); - alignMenu->insert( new KAction(i18n("To Top"), "aotop", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToTop()), actionCollection(), "align_to_top") ); - alignMenu->insert( new KAction(i18n("To Bottom"), "aobottom", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToBottom()), actionCollection(), "align_to_bottom") ); - alignMenu->insert( new KAction(i18n("To Grid"), "aopos2grid", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToGrid()), actionCollection(), "align_to_grid") ); - - KActionMenu *sizeMenu = new KActionMenu(i18n("Adjust Widgets' Sizes"), "aogrid", actionCollection(), "adjust_size_menu"); - sizeMenu->insert( new KAction(i18n("To Fit"), "aofit", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidgetSize()), actionCollection(), "adjust_to_fit") ); - sizeMenu->insert( new KAction(i18n("To Grid"), "aogrid", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustSizeToGrid()), actionCollection(), "adjust_size_grid") ); - sizeMenu->insert( new KAction(i18n("To Shortest"), "aoshortest", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToSmall()), actionCollection(), "adjust_height_small") ); - sizeMenu->insert( new KAction(i18n("To Tallest"), "aotallest", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToBig()), actionCollection(), "adjust_height_big") ); - sizeMenu->insert( new KAction(i18n("To Narrowest"), "aonarrowest", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToSmall()), actionCollection(), "adjust_width_small") ); - sizeMenu->insert( new KAction(i18n("To Widest"), "aowidest", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToBig()), actionCollection(), "adjust_width_big") ); + new TDEAction(i18n("Bring Widget to Front"), "raise", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(bringWidgetToFront()), actionCollection(), "format_raise"); + new TDEAction(i18n("Send Widget to Back"), "lower", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(sendWidgetToBack()), actionCollection(), "format_lower"); + + TDEActionMenu *alignMenu = new TDEActionMenu(i18n("Align Widgets' Positions"), "aopos2grid", actionCollection(), "align_menu"); + alignMenu->insert( new TDEAction(i18n("To Left"), "aoleft", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToLeft()), actionCollection(), "align_to_left") ); + alignMenu->insert( new TDEAction(i18n("To Right"), "aoright", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToRight()), actionCollection(), "align_to_right") ); + alignMenu->insert( new TDEAction(i18n("To Top"), "aotop", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToTop()), actionCollection(), "align_to_top") ); + alignMenu->insert( new TDEAction(i18n("To Bottom"), "aobottom", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToBottom()), actionCollection(), "align_to_bottom") ); + alignMenu->insert( new TDEAction(i18n("To Grid"), "aopos2grid", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToGrid()), actionCollection(), "align_to_grid") ); + + TDEActionMenu *sizeMenu = new TDEActionMenu(i18n("Adjust Widgets' Sizes"), "aogrid", actionCollection(), "adjust_size_menu"); + sizeMenu->insert( new TDEAction(i18n("To Fit"), "aofit", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidgetSize()), actionCollection(), "adjust_to_fit") ); + sizeMenu->insert( new TDEAction(i18n("To Grid"), "aogrid", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustSizeToGrid()), actionCollection(), "adjust_size_grid") ); + sizeMenu->insert( new TDEAction(i18n("To Shortest"), "aoshortest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToSmall()), actionCollection(), "adjust_height_small") ); + sizeMenu->insert( new TDEAction(i18n("To Tallest"), "aotallest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToBig()), actionCollection(), "adjust_height_big") ); + sizeMenu->insert( new TDEAction(i18n("To Narrowest"), "aonarrowest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToSmall()), actionCollection(), "adjust_width_small") ); + sizeMenu->insert( new TDEAction(i18n("To Widest"), "aowidest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToBig()), actionCollection(), "adjust_width_big") ); if(m_inShell) setXMLFile("kformdesigner_part_shell.rc"); @@ -536,7 +536,7 @@ KFormDesignerPart::disableWidgetActions() void KFormDesignerPart::setUndoEnabled(bool enabled, const TQString &text) { - KAction *undoAction = actionCollection()->action("edit_undo"); + TDEAction *undoAction = actionCollection()->action("edit_undo"); if(undoAction) { if(!text.isNull()) @@ -547,7 +547,7 @@ KFormDesignerPart::setUndoEnabled(bool enabled, const TQString &text) void KFormDesignerPart::setRedoEnabled(bool enabled, const TQString &text) { - KAction *redoAction = actionCollection()->action("edit_redo"); + TDEAction *redoAction = actionCollection()->action("edit_redo"); if(redoAction) { if(!text.isNull()) diff --git a/kexi/formeditor/test/kformdesigner_part.rc b/kexi/formeditor/test/kformdesigner_part.rc index 03c25f19..4fde21b4 100644 --- a/kexi/formeditor/test/kformdesigner_part.rc +++ b/kexi/formeditor/test/kformdesigner_part.rc @@ -41,9 +41,9 @@ <Action name="library_widget_QCheckBox"/> <Action name="library_widget_KIntSpinBox"/> <Action name="library_widget_KComboBox"/> - <Action name="library_widget_KListBox"/> + <Action name="library_widget_TDEListBox"/> <Action name="library_widget_KTextEdit"/> - <Action name="library_widget_KListView"/> + <Action name="library_widget_TDEListView"/> <Action name="library_widget_QSlider"/> <Action name="library_widget_KProgress"/> <Action name="library_widget_KTimeWidget"/> @@ -99,9 +99,9 @@ <Action name="library_widget_QCheckBox"/> <Action name="library_widget_KIntSpinBox"/> <Action name="library_widget_KComboBox"/> - <Action name="library_widget_KListBox"/> + <Action name="library_widget_TDEListBox"/> <Action name="library_widget_KTextEdit"/> - <Action name="library_widget_KListView"/> + <Action name="library_widget_TDEListView"/> <Action name="library_widget_QSlider"/> <Action name="library_widget_KProgress"/> <Action name="library_widget_KTimeWidget"/> diff --git a/kexi/formeditor/test/kformdesigner_part_shell.rc b/kexi/formeditor/test/kformdesigner_part_shell.rc index 8163cab3..c4dc3a20 100644 --- a/kexi/formeditor/test/kformdesigner_part_shell.rc +++ b/kexi/formeditor/test/kformdesigner_part_shell.rc @@ -52,9 +52,9 @@ <Action name="library_widget_QCheckBox"/> <Action name="library_widget_KIntSpinBox"/> <Action name="library_widget_KComboBox"/> - <Action name="library_widget_KListBox"/> + <Action name="library_widget_TDEListBox"/> <Action name="library_widget_KTextEdit"/> - <Action name="library_widget_KListView"/> + <Action name="library_widget_TDEListView"/> <Action name="library_widget_QSlider"/> <Action name="library_widget_KProgress"/> <Action name="library_widget_KTimeWidget"/> @@ -112,9 +112,9 @@ <Action name="library_widget_QCheckBox"/> <Action name="library_widget_KIntSpinBox"/> <Action name="library_widget_KComboBox"/> - <Action name="library_widget_KListBox"/> + <Action name="library_widget_TDEListBox"/> <Action name="library_widget_KTextEdit"/> - <Action name="library_widget_KListView"/> + <Action name="library_widget_TDEListView"/> <Action name="library_widget_QSlider"/> <Action name="library_widget_KProgress"/> <Action name="library_widget_KTimeWidget"/> diff --git a/kexi/formeditor/widgetfactory.h b/kexi/formeditor/widgetfactory.h index 0bc2b47c..7be11444 100644 --- a/kexi/formeditor/widgetfactory.h +++ b/kexi/formeditor/widgetfactory.h @@ -40,7 +40,7 @@ class TQDomElement; class TQDomDocument; class TQVariant; class TQListView; -class KActionCollection; +class TDEActionCollection; class KTextEdit; class KLineEdit; class KXMLGUIClient; @@ -107,7 +107,7 @@ class KFORMEDITOR_EXPORT WidgetInfo If this name is found when loading a .ui file, the className() will be used instead. It allows to support both KDE and TQt versions of widget, without duplicating code. As a rule, className() should always return a class name which is inherited from - alternate class. For example KListView class has alternate TQListView class. + alternate class. For example TDEListView class has alternate TQListView class. \a override parameter overrides class name of a widget, even if it was implemented in other factory. @@ -300,7 +300,7 @@ class KFORMEDITOR_EXPORT WidgetFactory : public TQObject /*! Creates custom actions. Reimplement this if you need to add some actions coming from the factory. */ - virtual void createCustomActions(KActionCollection *col) { Q_UNUSED(col); }; + virtual void createCustomActions(TDEActionCollection *col) { Q_UNUSED(col); }; /*! This function can be used to add custom items in widget \a w context menu \a menu. */ diff --git a/kexi/formeditor/widgetlibrary.cpp b/kexi/formeditor/widgetlibrary.cpp index c15c3a9c..a21c4f3f 100644 --- a/kexi/formeditor/widgetlibrary.cpp +++ b/kexi/formeditor/widgetlibrary.cpp @@ -319,7 +319,7 @@ WidgetLibrary::createXML() }*/ ActionList -WidgetLibrary::createWidgetActions(KXMLGUIClient* client, KActionCollection *parent, +WidgetLibrary::createWidgetActions(KXMLGUIClient* client, TDEActionCollection *parent, TQObject *receiver, const char *slot) { loadFactories(); @@ -348,7 +348,7 @@ WidgetLibrary::createWidgetActions(KXMLGUIClient* client, KActionCollection *par } void -WidgetLibrary::addCustomWidgetActions(KActionCollection *col) +WidgetLibrary::addCustomWidgetActions(TDEActionCollection *col) { for (TQAsciiDictIterator<WidgetFactory> it(d->factories); it.current(); ++it) { @@ -738,7 +738,7 @@ WidgetFactory::CreateWidgetOptions WidgetLibrary::showOrientationSelectionPopup( if (textVertical.isEmpty()) //default textVertical = i18n("InsertQt::Vertical Widget", "InsertQt::Vertical"); - KPopupMenu* popup = new KPopupMenu(parent, "orientationSelectionPopup"); + TDEPopupMenu* popup = new TDEPopupMenu(parent, "orientationSelectionPopup"); popup->insertTitle(SmallIcon(wclass->pixmap()), i18n("Insert Widget: %1").arg(wclass->name())); popup->insertItem(iconHorizontal, textHorizontal, 1); popup->insertItem(iconVertical, textVertical, 2); diff --git a/kexi/formeditor/widgetlibrary.h b/kexi/formeditor/widgetlibrary.h index f9db38aa..ca041396 100644 --- a/kexi/formeditor/widgetlibrary.h +++ b/kexi/formeditor/widgetlibrary.h @@ -30,8 +30,8 @@ template<class type> class TQPtrList; template<class type> class TQValueVector; -class KActionCollection; -class KAction; +class TDEActionCollection; +class TDEAction; class TQWidget; class TQPopupMenu; class TQVariant; @@ -45,10 +45,10 @@ class ObjectTreeItem; class WidgetLibraryPrivate; class WidgetPropertySet; -typedef TQPtrList<KAction> ActionList; +typedef TQPtrList<TDEAction> ActionList; /** - * This class searches for factories and provides KActions for widget creation. + * This class searches for factories and provides TDEActions for widget creation. * Every widget can be located using this library. * You call WidgetLibrary functions instead of calling directly factories. * See WidgetFactory for a description of the functions. @@ -73,10 +73,10 @@ class KFORMEDITOR_EXPORT WidgetLibrary : public TQObject /** * creates actions for widget creating */ - ActionList createWidgetActions(KXMLGUIClient* client, KActionCollection *parent, + ActionList createWidgetActions(KXMLGUIClient* client, TDEActionCollection *parent, TQObject *receiver, const char *slot); - void addCustomWidgetActions(KActionCollection *col); + void addCustomWidgetActions(TDEActionCollection *col); //old /** //old * creates the XML for widget actions diff --git a/kexi/kexiutils/debuggui.cpp b/kexi/kexiutils/debuggui.cpp index cbee692d..4119af75 100644 --- a/kexi/kexiutils/debuggui.cpp +++ b/kexi/kexiutils/debuggui.cpp @@ -34,8 +34,8 @@ static DebugWindowDialog* debugWindow = 0; static KTabWidget* debugWindowTab = 0; -static KListView* kexiDBDebugPage = 0; -static KListView* kexiAlterTableActionDebugPage = 0; +static TDEListView* kexiDBDebugPage = 0; +static TDEListView* kexiAlterTableActionDebugPage = 0; TQWidget *KexiUtils::createDebugWindow(TQWidget *parent) { @@ -66,7 +66,7 @@ void KexiUtils::addKexiDBDebug(const TQString& text) KPushButton *btn_clear = new KPushButton(KGuiItem("Clear", "clear_left"), page); hbox->addWidget(btn_clear); - kexiDBDebugPage = new KListView(page, "kexiDbDebugPage"); + kexiDBDebugPage = new TDEListView(page, "kexiDbDebugPage"); TQObject::connect(btn_clear, TQT_SIGNAL(clicked()), kexiDBDebugPage, TQT_SLOT(clear())); vbox->addWidget(kexiDBDebugPage); kexiDBDebugPage->addColumn(""); @@ -82,7 +82,7 @@ void KexiUtils::addKexiDBDebug(const TQString& text) //add \n after (about) every 30 characters //TODO TQString realText - KListViewItem * li = new KListViewItem( kexiDBDebugPage, kexiDBDebugPage->lastItem(), text ); + TDEListViewItem * li = new TDEListViewItem( kexiDBDebugPage, kexiDBDebugPage->lastItem(), text ); li->setMultiLinesEnabled( true ); } @@ -106,7 +106,7 @@ void KexiUtils::addAlterTableActionDebug(const TQString& text, int nestingLevel) btn_sim->setName("simulateAlterTableExecution"); hbox->addWidget(btn_sim); - kexiAlterTableActionDebugPage = new KListView(page, "kexiAlterTableActionDebugPage"); + kexiAlterTableActionDebugPage = new TDEListView(page, "kexiAlterTableActionDebugPage"); TQObject::connect(btn_clear, TQT_SIGNAL(clicked()), kexiAlterTableActionDebugPage, TQT_SLOT(clear())); vbox->addWidget(kexiAlterTableActionDebugPage); kexiAlterTableActionDebugPage->addColumn(""); @@ -121,7 +121,7 @@ void KexiUtils::addAlterTableActionDebug(const TQString& text, int nestingLevel) } if (text.isEmpty()) //don't move up! return; - KListViewItem * li; + TDEListViewItem * li; int availableNestingLevels = 0; // compute availableNestingLevels TQListViewItem * lastItem = kexiAlterTableActionDebugPage->lastItem(); @@ -144,16 +144,16 @@ void KexiUtils::addAlterTableActionDebug(const TQString& text, int nestingLevel) while (after && after->nextSibling()) after = after->nextSibling(); if (after) - li = new KListViewItem( lastItem, after, text ); //child, after + li = new TDEListViewItem( lastItem, after, text ); //child, after else - li = new KListViewItem( lastItem, text ); //1st child + li = new TDEListViewItem( lastItem, text ); //1st child } else { lastItem = kexiAlterTableActionDebugPage->lastItem(); while (lastItem && lastItem->parent()) lastItem = lastItem->parent(); //kdDebug() << "lastItem2: " << (lastItem ? lastItem->text(0) : TQString()) << endl; - li = new KListViewItem( kexiAlterTableActionDebugPage, lastItem, text ); //after + li = new TDEListViewItem( kexiAlterTableActionDebugPage, lastItem, text ); //after } li->setOpen(true); li->setMultiLinesEnabled( true ); diff --git a/kexi/main/kexifinddialog.cpp b/kexi/main/kexifinddialog.cpp index 80f3c83e..8ca17429 100644 --- a/kexi/main/kexifinddialog.cpp +++ b/kexi/main/kexifinddialog.cpp @@ -49,7 +49,7 @@ class KexiFindDialog::Private //! Connects action \a action with appropriate signal \a member //! and optionally adds accel that will receive shortcut for \a action //! at global scope of the dialog \a parent. - void setActionAndAccel(KAction *action, TQWidget* parent, const char* member) + void setActionAndAccel(TDEAction *action, TQWidget* parent, const char* member) { if (!action) return; @@ -65,10 +65,10 @@ class KexiFindDialog::Private TQStringList lookInColumnNames; TQStringList lookInColumnCaptions; TQString objectName; //!< for caption - TQGuardedPtr<KAction> findnextAction; - TQGuardedPtr<KAction> findprevAction; - TQGuardedPtr<KAction> replaceAction; - TQGuardedPtr<KAction> replaceallAction; + TQGuardedPtr<TDEAction> findnextAction; + TQGuardedPtr<TDEAction> findprevAction; + TQGuardedPtr<TDEAction> replaceAction; + TQGuardedPtr<TDEAction> replaceallAction; TQPtrList<TQAccel> accels; bool replaceMode : 1; }; @@ -84,7 +84,7 @@ KexiFindDialog::KexiFindDialog( TQWidget* parent ) m_search->setCurrentItem((int)KexiSearchAndReplaceViewInterface::Options::SearchDown); layout()->setMargin( KDialog::marginHint() ); layout()->setSpacing( KDialog::spacingHint() ); - KAction *a = KStdAction::findNext(0, 0, 0); + TDEAction *a = KStdAction::findNext(0, 0, 0); m_btnFind->setText(a->text()); m_btnFind->setIconSet(a->iconSet()); delete a; @@ -109,8 +109,8 @@ KexiFindDialog::~KexiFindDialog() delete d; } -void KexiFindDialog::setActions( KAction *findnext, KAction *findprev, - KAction *replace, KAction *replaceall ) +void KexiFindDialog::setActions( TDEAction *findnext, TDEAction *findprev, + TDEAction *replace, TDEAction *replaceall ) { d->findnextAction = findnext; d->findprevAction = findprev; diff --git a/kexi/main/kexifinddialog.h b/kexi/main/kexifinddialog.h index d93ac703..b0a5cac1 100644 --- a/kexi/main/kexifinddialog.h +++ b/kexi/main/kexifinddialog.h @@ -23,7 +23,7 @@ #include "kexifinddialogbase.h" #include <core/kexisearchandreplaceiface.h> -class KAction; +class TDEAction; //! @short A Kexi-specific "Find text" dialog. /*! Also used for as replace dialog. @@ -41,8 +41,8 @@ class KexiFindDialog : public KexiFindDialogBase virtual ~KexiFindDialog(); //! Sets actions that receive button clicks and shortcuts within the dialog. Should be called once. - void setActions( KAction *findnext, KAction *findprev, - KAction *replace, KAction *replaceall ); + void setActions( TDEAction *findnext, TDEAction *findprev, + TDEAction *replace, TDEAction *replaceall ); //! Shows the dialog as a modal dialog. virtual void show(); diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index ce29b32e..4bfaef61 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -316,13 +316,13 @@ KexiMainWindowImpl::KexiMainWindowImpl() //disabled (possible crash) d->hideMenuItem("file", i18n("&Import"), true); //disabled (possible crash) d->hideMenuItem("help", i18n( "&Report Bug..." ), true); #endif - KAction *tdemdi_tooldock_menu_action = childClients()->getFirst() ? childClients()->getFirst()->actionCollection()->action("tdemdi_tooldock_menu") : 0; + TDEAction *tdemdi_tooldock_menu_action = childClients()->getFirst() ? childClients()->getFirst()->actionCollection()->action("tdemdi_tooldock_menu") : 0; if (tdemdi_tooldock_menu_action) { tdemdi_tooldock_menu_action->setEnabled(false); } if (!isFakingSDIApplication()/* && !userMode()*/) { -// TQPopupMenu *menu = (TQPopupMenu*) child( "window", "KPopupMenu" ); +// TQPopupMenu *menu = (TQPopupMenu*) child( "window", "TDEPopupMenu" ); TQPopupMenu *menu = d->popups["window"]; unsigned int count = menuBar()->count(); if (menu) @@ -506,7 +506,7 @@ TQPopupMenu* KexiMainWindowImpl::findPopupMenu(const char *popupName) return d->popups[popupName]; } -KActionPtrList KexiMainWindowImpl::allActions() const +TDEActionPtrList KexiMainWindowImpl::allActions() const { return actionCollection()->actions(); } @@ -518,13 +518,13 @@ KexiDialogBase* KexiMainWindowImpl::currentDialog() const void KexiMainWindowImpl::initActions() { -// setupGUI(KMainWindow::Keys|KMainWindow::StatusBar|KMainWindow::Save|KMainWindow::Create); +// setupGUI(TDEMainWindow::Keys|TDEMainWindow::StatusBar|TDEMainWindow::Save|TDEMainWindow::Create); // d->actionMapper = new TQSignalMapper(this, "act_map"); // connect(d->actionMapper, TQT_SIGNAL(mapped(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotAction(const TQString &))); // PROJECT MENU - KAction *action = new KAction(i18n("&New..."), "filenew", KStdAccel::shortcut(KStdAccel::New), + TDEAction *action = new TDEAction(i18n("&New..."), "filenew", TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT(slotProjectNew()), actionCollection(), "project_new"); action->setToolTip(i18n("Create a new project")); action->setWhatsThis(i18n("Creates a new project. Currently opened project is not affected.")); @@ -534,7 +534,7 @@ void KexiMainWindowImpl::initActions() action->setWhatsThis(i18n("Opens an existing project. Currently opened project is not affected.")); #ifdef HAVE_KNEWSTUFF - action = new KAction(i18n("&Download Example Databases..."), "kget", KShortcut(0), + action = new TDEAction(i18n("&Download Example Databases..."), "kget", TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(slotGetNewStuff()), actionCollection(), "project_download_examples"); action->setToolTip(i18n("Download example databases from the Internet")); action->setWhatsThis(i18n("Downloads example databases from the Internet.")); @@ -544,7 +544,7 @@ void KexiMainWindowImpl::initActions() //#ifdef KEXI_SHOW_UNIMPLEMENTED #ifndef KEXI_NO_UNFINISHED - d->action_open_recent = new KActionMenu(i18n("Open Recent"), + d->action_open_recent = new TDEActionMenu(i18n("Open Recent"), actionCollection(), "project_open_recent"); connect(d->action_open_recent->popupMenu(),TQT_SIGNAL(activated(int)), this,TQT_SLOT(slotProjectOpenRecent(int))); @@ -563,26 +563,26 @@ void KexiMainWindowImpl::initActions() d->action_save = KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( slotProjectSave() ), actionCollection(), "project_save" ); -// d->action_save = new KAction(i18n("&Save"), "filesave", KStdAccel::shortcut(KStdAccel::Save), +// d->action_save = new TDEAction(i18n("&Save"), "filesave", TDEStdAccel::shortcut(TDEStdAccel::Save), // TQT_TQOBJECT(this), TQT_SLOT(slotProjectSave()), actionCollection(), "project_save"); d->action_save->setToolTip(i18n("Save object changes")); d->action_save->setWhatsThis(i18n("Saves object changes from currently selected window.")); #ifdef KEXI_SHOW_UNIMPLEMENTED - d->action_save_as = new KAction(i18n("Save &As..."), "filesaveas", 0, + d->action_save_as = new TDEAction(i18n("Save &As..."), "filesaveas", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectSaveAs()), actionCollection(), "project_saveas"); d->action_save_as->setToolTip(i18n("Save object as")); d->action_save_as->setWhatsThis( i18n("Saves object changes from currently selected window under a new name (within the same project).")); - d->action_project_properties = new KAction(i18n("Project Properties"), "info", 0, + d->action_project_properties = new TDEAction(i18n("Project Properties"), "info", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectProperties()), actionCollection(), "project_properties"); #else d->action_save_as = d->dummy_action; d->action_project_properties = d->dummy_action; #endif - d->action_close = new KAction(i18n("&Close Project"), "fileclose", 0, + d->action_close = new TDEAction(i18n("&Close Project"), "fileclose", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectClose()), actionCollection(), "project_close" ); d->action_close->setToolTip(i18n("Close the current project")); d->action_close->setWhatsThis(i18n("Closes the current project.")); @@ -590,7 +590,7 @@ void KexiMainWindowImpl::initActions() KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotProjectQuit()), actionCollection(), "quit"); #ifdef KEXI_SHOW_UNIMPLEMENTED - d->action_project_relations = new KAction(i18n("&Relationships..."), "relation", TQt::CTRL + TQt::Key_R, + d->action_project_relations = new TDEAction(i18n("&Relationships..."), "relation", TQt::CTRL + TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(slotProjectRelations()), actionCollection(), "project_relations"); d->action_project_relations->setToolTip(i18n("Project relationships")); d->action_project_relations->setWhatsThis(i18n("Shows project relationships.")); @@ -598,13 +598,13 @@ void KexiMainWindowImpl::initActions() #else d->action_project_relations = d->dummy_action; #endif - d->action_tools_data_migration = new KAction( + d->action_tools_data_migration = new TDEAction( i18n("&Import Database..."), "database_import", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToolsProjectMigration()), actionCollection(), "tools_import_project"); d->action_tools_data_migration->setToolTip(i18n("Import entire database as a Kexi project")); d->action_tools_data_migration->setWhatsThis(i18n("Imports entire database as a Kexi project.")); - d->action_tools_compact_database = new KAction( + d->action_tools_compact_database = new TDEAction( i18n("&Compact Database..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToolsCompactDatabase()), actionCollection(), "tools_compact_database"); d->action_tools_compact_database->setToolTip(i18n("Compact the current database project")); @@ -614,7 +614,7 @@ void KexiMainWindowImpl::initActions() if (userMode()) d->action_project_import_data_table = 0; else { - d->action_project_import_data_table = new KAction( + d->action_project_import_data_table = new TDEAction( i18n("Import->Table Data From File...", "Table Data From &File..."), "table"/*! @todo: change to "file_import" or so*/, 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectImportDataTable()), actionCollection(), @@ -623,7 +623,7 @@ void KexiMainWindowImpl::initActions() d->action_project_import_data_table->setWhatsThis(i18n("Imports table data from a file.")); } - d->action_project_export_data_table = new KAction(i18n("Export->Table or Query Data to File...", + d->action_project_export_data_table = new TDEAction(i18n("Export->Table or Query Data to File...", "Table or Query Data to &File..."), "table"/*! @todo: change to "file_export" or so*/, 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectExportDataTable()), actionCollection(), @@ -633,9 +633,9 @@ void KexiMainWindowImpl::initActions() d->action_project_export_data_table->setWhatsThis( i18n("Exports data from the active table or query data to a file.")); -//TODO new KAction(i18n("From File..."), "fileopen", 0, +//TODO new TDEAction(i18n("From File..."), "fileopen", 0, //TODO TQT_TQOBJECT(this), TQT_SLOT(slotImportFile()), actionCollection(), "project_import_file"); -//TODO new KAction(i18n("From Server..."), "server", 0, +//TODO new TDEAction(i18n("From Server..."), "server", 0, //TODO TQT_TQOBJECT(this), TQT_SLOT(slotImportServer()), actionCollection(), "project_import_server"); d->action_project_print = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotProjectPrint()), @@ -651,7 +651,7 @@ void KexiMainWindowImpl::initActions() d->action_project_print_preview->setWhatsThis( i18n("Shows print preview for the active table or query.")); - d->action_project_print_setup = new KAction(i18n("Page Set&up..."), + d->action_project_print_setup = new TDEAction(i18n("Page Set&up..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectPageSetup()), actionCollection(), "project_print_setup"); d->action_project_print_setup->setToolTip( @@ -668,7 +668,7 @@ void KexiMainWindowImpl::initActions() d->action_edit_paste_special_data_table = 0; else { d->action_edit_paste_special_data_table = - new KAction(i18n("Paste Special->As Data &Table...", "As Data &Table..."), + new TDEAction(i18n("Paste Special->As Data &Table...", "As Data &Table..."), "table", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditPasteSpecialDataTable()), actionCollection(), "edit_paste_special_data_table"); d->action_edit_paste_special_data_table->setToolTip( @@ -678,7 +678,7 @@ void KexiMainWindowImpl::initActions() } d->action_edit_copy_special_data_table = - new KAction(i18n("Copy Special->Table or Query Data...", + new TDEAction(i18n("Copy Special->Table or Query Data...", "Table or Query as Data Table..."), "table", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditCopySpecialDataTable()), actionCollection(), "edit_copy_special_data_table"); @@ -710,7 +710,7 @@ void KexiMainWindowImpl::initActions() //! @todo d->action_edit_replace = KStdAction::replace( //! TQT_TQOBJECT(this), TQT_SLOT(slotEditReplace()), actionCollection(), "project_print_preview" ); d->action_edit_replace_all = 0; -//! @todo d->action_edit_replace_all = new KAction( i18n("Replace All"), "", 0, +//! @todo d->action_edit_replace_all = new TDEAction( i18n("Replace All"), "", 0, //! TQT_TQOBJECT(this), TQT_SLOT(slotEditReplaceAll()), actionCollection(), "edit_replaceall"); d->action_edit_select_all = createSharedAction( KStdAction::SelectAll, "edit_select_all"); @@ -744,7 +744,7 @@ void KexiMainWindowImpl::initActions() //VIEW MENU if (!userMode()) { - d->action_view_data_mode = new KRadioAction(i18n("&Data View"), "state_data", TQt::Key_F6, + d->action_view_data_mode = new TDERadioAction(i18n("&Data View"), "state_data", TQt::Key_F6, TQT_TQOBJECT(this), TQT_SLOT(slotViewDataMode()), actionCollection(), "view_data_mode"); d->actions_for_view_modes.insert( Kexi::DataViewMode, d->action_view_data_mode ); d->action_view_data_mode->setExclusiveGroup("view_mode"); @@ -755,7 +755,7 @@ void KexiMainWindowImpl::initActions() d->action_view_data_mode = 0; if (!userMode()) { - d->action_view_design_mode = new KRadioAction(i18n("D&esign View"), "state_edit", TQt::Key_F7, + d->action_view_design_mode = new TDERadioAction(i18n("D&esign View"), "state_edit", TQt::Key_F7, TQT_TQOBJECT(this), TQT_SLOT(slotViewDesignMode()), actionCollection(), "view_design_mode"); d->actions_for_view_modes.insert( Kexi::DesignViewMode, d->action_view_design_mode ); d->action_view_design_mode->setExclusiveGroup("view_mode"); @@ -766,7 +766,7 @@ void KexiMainWindowImpl::initActions() d->action_view_design_mode = 0; if (!userMode()) { - d->action_view_text_mode = new KRadioAction(i18n("&Text View"), "state_sql", TQt::Key_F8, + d->action_view_text_mode = new TDERadioAction(i18n("&Text View"), "state_sql", TQt::Key_F8, TQT_TQOBJECT(this), TQT_SLOT(slotViewTextMode()), actionCollection(), "view_text_mode"); d->actions_for_view_modes.insert( Kexi::TextViewMode, d->action_view_text_mode ); d->action_view_text_mode->setExclusiveGroup("view_mode"); @@ -777,7 +777,7 @@ void KexiMainWindowImpl::initActions() d->action_view_text_mode = 0; if (d->isProjectNavigatorVisible) { - d->action_view_nav = new KAction(i18n("Project Navigator"), "", TQt::ALT + TQt::Key_1, + d->action_view_nav = new TDEAction(i18n("Project Navigator"), "", TQt::ALT + TQt::Key_1, TQT_TQOBJECT(this), TQT_SLOT(slotViewNavigator()), actionCollection(), "view_navigator"); d->action_view_nav->setToolTip(i18n("Go to project navigator panel")); d->action_view_nav->setWhatsThis(i18n("Goes to project navigator panel.")); @@ -785,13 +785,13 @@ void KexiMainWindowImpl::initActions() else d->action_view_nav = 0; - d->action_view_mainarea = new KAction(i18n("Main Area"), "", TQt::ALT + TQt::Key_2, + d->action_view_mainarea = new TDEAction(i18n("Main Area"), "", TQt::ALT + TQt::Key_2, TQT_TQOBJECT(this), TQT_SLOT(slotViewMainArea()), actionCollection(), "view_mainarea"); d->action_view_mainarea->setToolTip(i18n("Go to main area")); d->action_view_mainarea->setWhatsThis(i18n("Goes to main area.")); if (!userMode()) { - d->action_view_propeditor = new KAction(i18n("Property Editor"), "", TQt::ALT + TQt::Key_3, + d->action_view_propeditor = new TDEAction(i18n("Property Editor"), "", TQt::ALT + TQt::Key_3, TQT_TQOBJECT(this), TQT_SLOT(slotViewPropertyEditor()), actionCollection(), "view_propeditor"); d->action_view_propeditor->setToolTip(i18n("Go to property editor panel")); d->action_view_propeditor->setWhatsThis(i18n("Goes to property editor panel.")); @@ -851,13 +851,13 @@ void KexiMainWindowImpl::initActions() //WINDOW MENU #ifndef TQ_WS_WIN //KMDI <= 3.5.1 has no shortcut here: - KAction *closeWindowAction = actionCollection()->action("window_close"); + TDEAction *closeWindowAction = actionCollection()->action("window_close"); if (closeWindowAction) - closeWindowAction->setShortcut(KStdAccel::close()); + closeWindowAction->setShortcut(TDEStdAccel::close()); #endif //additional 'Window' menu items - d->action_window_next = new KAction( i18n("&Next Window"), "", + d->action_window_next = new TDEAction( i18n("&Next Window"), "", #ifdef TQ_WS_WIN TQt::CTRL+TQt::Key_Tab, #else @@ -867,7 +867,7 @@ void KexiMainWindowImpl::initActions() d->action_window_next->setToolTip( i18n("Next window") ); d->action_window_next->setWhatsThis(i18n("Switches to the next window.")); - d->action_window_previous = new KAction( i18n("&Previous Window"), "", + d->action_window_previous = new TDEAction( i18n("&Previous Window"), "", #ifdef TQ_WS_WIN TQt::CTRL+TQt::SHIFT+TQt::Key_Tab, #else @@ -886,12 +886,12 @@ void KexiMainWindowImpl::initActions() action = KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection() ); action->setWhatsThis(i18n("Lets you configure toolbars.")); - d->action_show_other = new KActionMenu(i18n("Other"), + d->action_show_other = new TDEActionMenu(i18n("Other"), actionCollection(), "options_show_other"); #endif #ifndef KEXI_NO_CTXT_HELP - d->action_show_helper = new KToggleAction(i18n("Show Context Help"), "", TQt::CTRL + TQt::Key_H, + d->action_show_helper = new TDEToggleAction(i18n("Show Context Help"), "", TQt::CTRL + TQt::Key_H, actionCollection(), "options_show_contexthelp"); #if KDE_IS_VERSION(3,2,90) d->action_show_helper->setCheckedState(i18n("Hide Context Help")); @@ -933,18 +933,18 @@ void KexiMainWindowImpl::initActions() ->setWhatsThis(i18n("This shows useful tips on the use of this application.")); #endif #if 0 //we don't have a time for updating info text for each new version - new KAction(i18n("Important Information"), "messagebox_info", 0, + new TDEAction(i18n("Important Information"), "messagebox_info", 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportantInfo()), actionCollection(), "help_show_important_info"); #endif //TODO: UNCOMMENT TO REMOVE MDI MODES SETTING m_pMdiModeMenu->hide(); #ifndef KEXI_NO_FEEDBACK_AGENT #ifdef FEEDBACK_CLASS - new KAction(i18n("Give Feedback..."), "messagebox_info", 0, + new TDEAction(i18n("Give Feedback..."), "messagebox_info", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStartFeedbackAgent()), actionCollection(), "help_start_feedback_agent"); #endif #endif -// KAction *actionSettings = new KAction(i18n("Configure Kexi..."), "configure", 0, +// TDEAction *actionSettings = new TDEAction(i18n("Configure Kexi..."), "configure", 0, // actionCollection(), "kexi_settings"); // actionSettings->setWhatsThis(i18n("Lets you configure Kexi.")); // connect(actionSettings, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(slotShowSettings())); @@ -1373,7 +1373,7 @@ tristate KexiMainWindowImpl::createProjectFromTemplate(const KexiProjectData& pr KURL url; url.setPath( fname ); if (url.isLocalFile()) - KRecentDirs::add(startDir, url.directory()); + TDERecentDirs::add(startDir, url.directory()); } #else Q_UNUSED(projectData); @@ -1394,7 +1394,7 @@ tristate KexiMainWindowImpl::createProjectFromTemplate(const KexiProjectData& pr dlg.exec(); fname = dlg.selectedFile(); if (!fname.isEmpty()) - KRecentDocument::add(fname); + TDERecentDocument::add(fname); // fname = KFileDialog::getSaveFileName(fname.isEmpty() ? startDir : fname, // mimetypes.join(" "), this, caption); #endif @@ -1420,9 +1420,9 @@ void KexiMainWindowImpl::updateReadOnlyState() if (d->nav) d->nav->setReadOnly(readOnly); // update "insert ....." actions for every part - KActionCollection *ac = actionCollection(); + TDEActionCollection *ac = actionCollection(); for (KexiPart::PartInfoListIterator it(*Kexi::partManager().partInfoList()); it.current(); ++it) { - KAction *a = ac->action( TQString(KexiPart::nameForCreateAction( *it.current() )).ascii() ); + TDEAction *a = ac->action( TQString(KexiPart::nameForCreateAction( *it.current() )).ascii() ); if (a) a->setEnabled(!readOnly); } @@ -2797,7 +2797,7 @@ KexiMainWindowImpl::slotProjectOpenRecentAboutToShow() { /* //setup - KPopupMenu *popup = d->action_open_recent->popupMenu(); + TDEPopupMenu *popup = d->action_open_recent->popupMenu(); const int cnt = popup->count(); //remove older for (int i = 0; i<cnt; i++) { @@ -2817,7 +2817,7 @@ KexiMainWindowImpl::slotProjectOpenRecentAboutToShow() */ //show recent databases - KPopupMenu *popup = d->action_open_recent->popupMenu(); + TDEPopupMenu *popup = d->action_open_recent->popupMenu(); popup->clear(); #if 0 d->action_open_recent_projects_title_id = popup->insertTitle(i18n("Recently Opened Databases")); diff --git a/kexi/main/keximainwindowimpl.h b/kexi/main/keximainwindowimpl.h index 9721a558..8df772ce 100644 --- a/kexi/main/keximainwindowimpl.h +++ b/kexi/main/keximainwindowimpl.h @@ -91,7 +91,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI virtual TQPopupMenu* findPopupMenu(const char *popupName); /*! Implemented for KexiMainWindow. */ - virtual KActionPtrList allActions() const; + virtual TDEActionPtrList allActions() const; /*! \return currently active dialog (window) od 0 if there is no active dialog. Implemented for KexiMainWindow. */ diff --git a/kexi/main/keximainwindowimpl_p.h b/kexi/main/keximainwindowimpl_p.h index c775b087..83814f4e 100644 --- a/kexi/main/keximainwindowimpl_p.h +++ b/kexi/main/keximainwindowimpl_p.h @@ -73,7 +73,7 @@ public: wasAutoOpen = false; dialogExistedBeforeCloseProject = false; #ifndef KEXI_SHOW_UNIMPLEMENTED - dummy_action = new KActionMenu(TQString(""), TQT_TQOBJECT(wnd)); + dummy_action = new TDEActionMenu(TQString(""), TQT_TQOBJECT(wnd)); #endif maximizeFirstOpenedChildFrm = false; #ifdef HAVE_KNEWSTUFF @@ -191,7 +191,7 @@ public: { if (curDialog.isNull()) return; - KRadioAction *ra = actions_for_view_modes[ curDialog->currentViewMode() ]; + TDERadioAction *ra = actions_for_view_modes[ curDialog->currentViewMode() ]; if (ra) ra->setChecked(true); // if (!last_checked_mode) @@ -393,7 +393,7 @@ void updatePropEditorDockWidthInfo() { KexiViewBase *view = curDialog->selectedView(); if (!view) return 0; - KAction *action = view->sharedAction(actionName); + TDEAction *action = view->sharedAction(actionName); if (!action || !action->isEnabled()) return 0; return view; @@ -442,24 +442,24 @@ void updatePropEditorDockWidthInfo() { TQString appCaptionPrefix; //<! application's caption prefix - prj name (if opened), else: null #ifndef KEXI_SHOW_UNIMPLEMENTED - KActionMenu *dummy_action; + TDEActionMenu *dummy_action; #endif //! project menu - KAction *action_save, *action_save_as, *action_close, + TDEAction *action_save, *action_save_as, *action_close, *action_project_properties, *action_open_recent_more, *action_project_relations, *action_project_import_data_table, *action_project_export_data_table, *action_project_print, *action_project_print_preview, *action_project_print_setup; -// KRecentFilesAction *action_open_recent; - KActionMenu *action_open_recent, *action_show_other; +// TDERecentFilesAction *action_open_recent; + TDEActionMenu *action_open_recent, *action_show_other; // int action_open_recent_more_id; int action_open_recent_projects_title_id, action_open_recent_connections_title_id; //! edit menu - KAction *action_edit_delete, *action_edit_delete_row, + TDEAction *action_edit_delete, *action_edit_delete_row, *action_edit_cut, *action_edit_copy, *action_edit_paste, *action_edit_find, *action_edit_findnext, *action_edit_findprev, *action_edit_replace, *action_edit_replace_all, @@ -471,30 +471,30 @@ void updatePropEditorDockWidthInfo() { *action_edit_copy_special_data_table; //! view menu - KAction *action_view_nav, *action_view_propeditor, *action_view_mainarea; - KRadioAction *action_view_data_mode, *action_view_design_mode, *action_view_text_mode; - TQIntDict<KRadioAction> actions_for_view_modes; -// KRadioAction *last_checked_mode; + TDEAction *action_view_nav, *action_view_propeditor, *action_view_mainarea; + TDERadioAction *action_view_data_mode, *action_view_design_mode, *action_view_text_mode; + TQIntDict<TDERadioAction> actions_for_view_modes; +// TDERadioAction *last_checked_mode; #ifndef KEXI_NO_CTXT_HELP - KToggleAction *action_show_helper; + TDEToggleAction *action_show_helper; #endif //! data menu - KAction *action_data_save_row; - KAction *action_data_cancel_row_changes; - KAction *action_data_execute; + TDEAction *action_data_save_row; + TDEAction *action_data_cancel_row_changes; + TDEAction *action_data_execute; //! format menu - KAction *action_format_font; + TDEAction *action_format_font; //! tools menu - KAction *action_tools_data_migration, *action_tools_compact_database; - KActionMenu *action_tools_scripts; + TDEAction *action_tools_data_migration, *action_tools_compact_database; + TDEActionMenu *action_tools_scripts; //! window menu - KAction *action_window_next, *action_window_previous; + TDEAction *action_window_next, *action_window_previous; //! settings menu - KAction *action_configure; + TDEAction *action_configure; //! for dock windows KMdiToolViewAccessor* navToolWindow; diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.cpp b/kexi/main/printing/kexisimpleprintingpagesetup.cpp index 5d823a13..de3f64e2 100644 --- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp +++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp @@ -501,7 +501,7 @@ void KexiSimplePrintingPageSetup::slotTitleTextChanged(const TQString&) void KexiSimplePrintingPageSetup::slotChangeTitleFont() { - if (TQDialog::Accepted != KFontDialog::getFont(m_settings.pageTitleFont, false, this)) + if (TQDialog::Accepted != TDEFontDialog::getFont(m_settings.pageTitleFont, false, this)) return; m_contents->headerTitleLineEdit->setFont( m_settings.pageTitleFont ); setDirty(true); diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp index 83d9cb06..e587556b 100644 --- a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp +++ b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp @@ -162,10 +162,10 @@ KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow( TQVBoxLayout *lyr = new TQVBoxLayout(this, 6); int id; - m_toolbar = new KToolBar(0, this); + m_toolbar = new TDEToolBar(0, this); m_toolbar->setLineWidth(0); m_toolbar->setFrameStyle(TQFrame::NoFrame); - m_toolbar->setIconText(KToolBar::IconTextRight); + m_toolbar->setIconText(TDEToolBar::IconTextRight); lyr->addWidget(m_toolbar); id = m_toolbar->insertWidget( -1, 0, new KPushButton(KStdGuiItem::print(), m_toolbar) ); @@ -204,14 +204,14 @@ KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow( TQHBoxLayout *navToolbarLyr = new TQHBoxLayout(navToolbarWidget); lyr->addWidget(navToolbarWidget); - m_navToolbar = new KToolBar(0, navToolbarWidget); + m_navToolbar = new TDEToolBar(0, navToolbarWidget); navToolbarLyr->addStretch(1); navToolbarLyr->addWidget(m_navToolbar); navToolbarLyr->addStretch(1); // m_navToolbar->setFullWidth(true); m_navToolbar->setLineWidth(0); m_navToolbar->setFrameStyle(TQFrame::NoFrame); - m_navToolbar->setIconText(KToolBar::IconTextRight); + m_navToolbar->setIconText(TDEToolBar::IconTextRight); m_idFirst = m_navToolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("start"), i18n("First Page"), m_navToolbar)); m_navToolbar->addConnection(m_idFirst, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotFirstClicked())); diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.h b/kexi/main/printing/kexisimpleprintpreviewwindow.h index 8f76e803..c966553f 100644 --- a/kexi/main/printing/kexisimpleprintpreviewwindow.h +++ b/kexi/main/printing/kexisimpleprintpreviewwindow.h @@ -71,7 +71,7 @@ class KexiSimplePrintPreviewWindow : public TQWidget KexiSimplePrintingEngine &m_engine; const KexiSimplePrintingSettings& m_settings; - KToolBar *m_toolbar, *m_navToolbar; + TDEToolBar *m_toolbar, *m_navToolbar; int m_pageNumber; int m_pagesCount; //!< needed to know that pages could has been changed int m_idFirst, m_idLast, m_idPrevious, m_idNext, m_idPageNumberLabel; diff --git a/kexi/main/startup/KexiConnSelector.h b/kexi/main/startup/KexiConnSelector.h index 00ace8dc..ab4ed10a 100644 --- a/kexi/main/startup/KexiConnSelector.h +++ b/kexi/main/startup/KexiConnSelector.h @@ -64,7 +64,7 @@ class KEXIMAIN_EXPORT KexiConnSelectorWidget : public TQWidget \a conn_set can be altered, because Add/Edit/Remove buttons are available to users. \a startDirOrVariable can be provided to specify a start dir for file browser (it can also contain a configuration variable name with ":" prefix as described - in KRecentDirs documentation). */ + in TDERecentDirs documentation). */ KexiConnSelectorWidget( KexiDBConnectionSet& conn_set, const TQString& startDirOrVariable, TQWidget* parent = 0, const char* name = 0 ); diff --git a/kexi/main/startup/KexiNewPrjTypeSelector.ui b/kexi/main/startup/KexiNewPrjTypeSelector.ui index 122137e1..9ea3a0db 100644 --- a/kexi/main/startup/KexiNewPrjTypeSelector.ui +++ b/kexi/main/startup/KexiNewPrjTypeSelector.ui @@ -36,7 +36,7 @@ </size> </property> </spacer> - <widget class="KListView" row="1" column="0"> + <widget class="TDEListView" row="1" column="0"> <column> <property name="text"> <string></string> diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp index 3e59d937..44fb7026 100644 --- a/kexi/main/startup/KexiNewProjectWizard.cpp +++ b/kexi/main/startup/KexiNewProjectWizard.cpp @@ -67,8 +67,8 @@ class KexiNewProjectWizardPrivate // delete project_set_to_show; delete msgHandler; } -// KListView *lv_types; - KListViewItem *lvi_file, *lvi_server; +// TDEListView *lv_types; + TDEListViewItem *lvi_file, *lvi_server; TQString chk_file_txt, chk_server_txt; //!< helper TQString server_db_name_dblist_lbl_txt; //!< helper @@ -95,7 +95,7 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set, //page: type selector m_prjtype_sel = new KexiNewPrjTypeSelector(this, "KexiNewPrjTypeSelector"); -// lv_types = new KListView(m_prjtype_sel, "types listview"); +// lv_types = new TDEListView(m_prjtype_sel, "types listview"); // m_prjtype_sel->lv_types->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum, 0, 2)); #if KDE_IS_VERSION(3,3,9) m_prjtype_sel->lv_types->setShadeSortColumn(false); @@ -105,14 +105,14 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set, m_prjtype_sel->lv_types->setAlternateBackground(TQColor()); //disable altering m_prjtype_sel->lv_types->setItemMargin( KDialogBase::marginHint() ); TQString none; - d->lvi_file = new KListViewItem( m_prjtype_sel->lv_types, i18n("New Project Stored in File") ); + d->lvi_file = new TDEListViewItem( m_prjtype_sel->lv_types, i18n("New Project Stored in File") ); d->lvi_file->setPixmap(0, TDEGlobal::iconLoader()->loadIcon( KMimeType::mimeType( KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0), KIcon::Desktop ) ); d->lvi_file->setMultiLinesEnabled( true ); - d->lvi_server = new KListViewItem( m_prjtype_sel->lv_types, d->lvi_file, + d->lvi_server = new TDEListViewItem( m_prjtype_sel->lv_types, d->lvi_file, i18n("New Project Stored on Database Server") ); d->lvi_server->setPixmap(0, DesktopIcon("network") ); d->lvi_server->setMultiLinesEnabled( true ); diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp index 5c281256..21eb3edf 100644 --- a/kexi/main/startup/KexiStartupDialog.cpp +++ b/kexi/main/startup/KexiStartupDialog.cpp @@ -299,7 +299,7 @@ void KexiStartupDialog::setupPageTemplates() d->templatesWidget = new KJanusWidget( d->pageTemplates, "templatesWidget", KJanusWidget::IconList); {//aaa! dirty hack - d->templatesWidget_IconListBox = d->templatesWidget->child(0,"KListBox"); + d->templatesWidget_IconListBox = d->templatesWidget->child(0,"TDEListBox"); if (d->templatesWidget_IconListBox) d->templatesWidget_IconListBox->installEventFilter(this); } diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp index d919463d..5db58c82 100644 --- a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp +++ b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp @@ -49,13 +49,13 @@ }*/ //! @internal -class TemplateItem : public KListViewItem +class TemplateItem : public TDEListViewItem { public: TemplateItem(TQListView* parent, const TQString& aFilename, const TQString& name, const TQString& description, const TQPixmap& icon, const TQValueList<KexiProjectData::ObjectInfo>& aAutoopenObjects) - : KListViewItem(parent, name + "\n" + description) + : TDEListViewItem(parent, name + "\n" + description) , autoopenObjects(aAutoopenObjects) , filename(aFilename) { @@ -70,7 +70,7 @@ class TemplateItem : public KListViewItem //----------------------- KexiStartupDialogTemplatesPage::KexiStartupDialogTemplatesPage( TQWidget * parent ) - : KListView(parent, "KexiStartupDialogTemplatesPage") + : TDEListView(parent, "KexiStartupDialogTemplatesPage") , m_popuplated(false) { addColumn(TQString()); diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.h b/kexi/main/startup/KexiStartupDialogTemplatesPage.h index 82ba7fe2..07b8b663 100644 --- a/kexi/main/startup/KexiStartupDialogTemplatesPage.h +++ b/kexi/main/startup/KexiStartupDialogTemplatesPage.h @@ -24,7 +24,7 @@ #include <core/kexiprojectdata.h> /*! Helper class for displaying templates set with description. */ -class KEXIMAIN_EXPORT KexiStartupDialogTemplatesPage : public KListView +class KEXIMAIN_EXPORT KexiStartupDialogTemplatesPage : public TDEListView { Q_OBJECT diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp index 6b8ab9d4..29567ce0 100644 --- a/kexi/main/startup/KexiStartupFileDialog_win.cpp +++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp @@ -107,7 +107,7 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f //TODO TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceTQToolBar ); //TODO toolbar = 0; //(js) -//(js) toolbar = new KToolBar( d->mainWidget, "KFileDialog::toolbar", true); +//(js) toolbar = new TDEToolBar( d->mainWidget, "KFileDialog::toolbar", true); //(js) toolbar->setFlat(true); //TODO tqInstallMsgHandler( oldHandler ); @@ -179,7 +179,7 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f ops->setupMenu(KDirOperator::SortActions | KDirOperator::FileActions | KDirOperator::ViewActions); - KActionCollection *coll = ops->actionCollection(); + TDEActionCollection *coll = ops->actionCollection(); // plug nav items into the toolbar coll->action( "up" )->plug( toolbar ); @@ -211,12 +211,12 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f connect( d->bookmarkHandler, TQT_SIGNAL( openURL( const TQString& )), TQT_SLOT( enterURL( const TQString& ))); - KToggleAction *showSidebarAction = - new KToggleAction(i18n("Show Quick Access Navigation Panel"), Key_F9, coll,"toggleSpeedbar"); + TDEToggleAction *showSidebarAction = + new TDEToggleAction(i18n("Show Quick Access Navigation Panel"), Key_F9, coll,"toggleSpeedbar"); connect( showSidebarAction, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( toggleSpeedbar( bool )) ); - KActionMenu *menu = new KActionMenu( i18n("Configure"), "configure", this, "extra menu" ); + TDEActionMenu *menu = new TDEActionMenu( i18n("Configure"), "configure", this, "extra menu" ); menu->setWhatsThis(i18n("<qt>This is the configuration menu for the file dialog. " "Various options can be accessed from this menu including: <ul>" "<li>how files are sorted in the list</li>" @@ -257,8 +257,8 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f toolbar->setItemAutoSized (PATH_COMBO); - toolbar->setIconText(KToolBar::IconOnly); - toolbar->setBarPos(KToolBar::Top); + toolbar->setIconText(TDEToolBar::IconOnly); + toolbar->setBarPos(TDEToolBar::Top); toolbar->setMovingEnabled(false); toolbar->adjustSize(); @@ -471,6 +471,6 @@ void KexiStartupFileDialogBase::saveLastVisitedPath(const TQString& path) TQFileInfo fi(path); TQString dir( fi.isDir() ? fi.absFilePath() : fi.dir(true).absPath() ); if (!dir.isEmpty()) - KRecentDirs::add(m_lastVisitedPathsVariable, dir); + TDERecentDirs::add(m_lastVisitedPathsVariable, dir); } } diff --git a/kexi/migration/importwizard.h b/kexi/migration/importwizard.h index 97ffec4f..0c60c5b7 100644 --- a/kexi/migration/importwizard.h +++ b/kexi/migration/importwizard.h @@ -36,7 +36,7 @@ class TQHBoxLayout; class TQVBoxLayout; class TQVButtonGroup; class KComboBox; -class KListView; +class TDEListView; class KLineEdit; class KexiConnSelectorWidget; class KexiProjectSelectorWidget; diff --git a/kexi/plugins/forms/kexiactionselectiondialog.cpp b/kexi/plugins/forms/kexiactionselectiondialog.cpp index bec4de7d..59cfefa5 100644 --- a/kexi/plugins/forms/kexiactionselectiondialog.cpp +++ b/kexi/plugins/forms/kexiactionselectiondialog.cpp @@ -46,7 +46,7 @@ #include <widget/kexibrowseritem.h> #include <kexiutils/utils.h> -typedef KListViewItemTemplate<TQString> ActionSelectorDialogListItemBase; +typedef TDEListViewItemTemplate<TQString> ActionSelectorDialogListItemBase; class ActionSelectorDialogListItem : public ActionSelectorDialogListItemBase { @@ -79,7 +79,7 @@ protected: //--------------------------------------- ActionsListViewBase::ActionsListViewBase(TQWidget* parent) - : KListView(parent) + : TDEListView(parent) { setResizeMode(TQListView::AllColumns); addColumn(""); @@ -115,27 +115,27 @@ void ActionsListViewBase::selectAction(const TQString& actionName) //--------------------------------------- -KActionsListViewBase::KActionsListViewBase(TQWidget* parent, KexiMainWindow* mainWin) +TDEActionsListViewBase::TDEActionsListViewBase(TQWidget* parent, KexiMainWindow* mainWin) : ActionsListViewBase(parent) , m_mainWin(mainWin) { } -KActionsListViewBase::~KActionsListViewBase() {} +TDEActionsListViewBase::~TDEActionsListViewBase() {} -void KActionsListViewBase::init() +void TDEActionsListViewBase::init() { setSorting(0); const TQPixmap noIcon( KexiUtils::emptyIcon(KIcon::Small) ); - KActionPtrList sharedActions( m_mainWin->allActions() ); + TDEActionPtrList sharedActions( m_mainWin->allActions() ); const Kexi::ActionCategories *acat = Kexi::actionCategories(); - foreach (KActionPtrList::ConstIterator, it, sharedActions) { + foreach (TDEActionPtrList::ConstIterator, it, sharedActions) { // kdDebug() << (*it)->name() << " " << (*it)->text() << endl; //! @todo group actions - //! @todo: store KAction* here? + //! @todo: store TDEAction* here? const int actionCategories = acat->actionCategories((*it)->name()); if (actionCategories==-1) { - kexipluginswarn << "KActionsListViewBase(): no category declared for action \"" + kexipluginswarn << "TDEActionsListViewBase(): no category declared for action \"" << (*it)->name() << "\"! Fix this!" << endl; continue; } @@ -152,15 +152,15 @@ void KActionsListViewBase::init() //--------------------------------------- -//! @internal Used to display KActions (in column 2) -class KActionsListView : public KActionsListViewBase +//! @internal Used to display TDEActions (in column 2) +class TDEActionsListView : public TDEActionsListViewBase { public: - KActionsListView(TQWidget* parent, KexiMainWindow* mainWin) - : KActionsListViewBase(parent, mainWin) + TDEActionsListView(TQWidget* parent, KexiMainWindow* mainWin) + : TDEActionsListViewBase(parent, mainWin) { } - virtual ~KActionsListView() {} + virtual ~TDEActionsListView() {} virtual bool isActionVisible(const char* actionName, int actionCategories) const { Q_UNUSED(actionName); @@ -168,12 +168,12 @@ public: } }; -//! @internal Used to display KActions (in column 2) -class CurrentFormActionsListView : public KActionsListViewBase +//! @internal Used to display TDEActions (in column 2) +class CurrentFormActionsListView : public TDEActionsListViewBase { public: CurrentFormActionsListView(TQWidget* parent, KexiMainWindow* mainWin) - : KActionsListViewBase(parent, mainWin) + : TDEActionsListViewBase(parent, mainWin) { } virtual ~CurrentFormActionsListView() {} @@ -276,7 +276,7 @@ class ActionToExecuteListView : public ActionsListViewBase ActionSelectorDialogListItem *printItem = new ActionSelectorDialogListItem( "print", this, i18n("Print")); printItem->setPixmap(0, SmallIcon("fileprint")); - KAction *a = KStdAction::printPreview(0, 0, 0); + TDEAction *a = KStdAction::printPreview(0, 0, 0); item = new ActionSelectorDialogListItem("printPreview", printItem, a->text().replace("&", "").replace("...", "")); item->setPixmap(0, SmallIcon(a->icon())); @@ -377,7 +377,7 @@ public: TQString actionWidgetName; ActionCategoriesListView* actionCategoriesListView; //!< for column #1 TQWidget *kactionPageWidget; - KActionsListView* kactionListView; //!< for column #2 + TDEActionsListView* kactionListView; //!< for column #2 KexiBrowser* objectsListView; //!< for column #2 TQWidget *currentFormActionsPageWidget; //!< for column #2 CurrentFormActionsListView* currentFormActionsListView; //!< for column #2 @@ -419,7 +419,7 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ \______________________________________________/ glyr [a]- TQWidgetStack *secondAnd3rdColumnStack, - - for displaying KActions, the stack contains d->kactionPageWidget TQWidget + - for displaying TDEActions, the stack contains d->kactionPageWidget TQWidget - for displaying objects, the stack contains secondAnd3rdColumnMainWidget TQWidget and TQGridLayout *secondAnd3rdColumnGrLyr - kactionPageWidget contains only a TQVBoxLayout and label+kactionListView */ @@ -530,12 +530,12 @@ KexiActionSelectionDialog::~KexiActionSelectionDialog() delete d; } -void KexiActionSelectionDialog::slotKActionItemExecuted(TQListViewItem*) +void KexiActionSelectionDialog::slotTDEActionItemExecuted(TQListViewItem*) { accept(); } -void KexiActionSelectionDialog::slotKActionItemSelected(TQListViewItem*) +void KexiActionSelectionDialog::slotTDEActionItemSelected(TQListViewItem*) { d->setActionToExecuteSectionVisible(false); updateOKButtonStatus(); @@ -585,7 +585,7 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item) d->kactionPageWidget = new TQWidget(); d->kactionPageWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); TQVBoxLayout *vlyr = new TQVBoxLayout(d->kactionPageWidget, 0, KDialog::spacingHint()); - d->kactionListView = new KActionsListView(d->kactionPageWidget, d->mainWin); + d->kactionListView = new TDEActionsListView(d->kactionPageWidget, d->mainWin); d->kactionListView->init(); TQLabel *lbl = new TQLabel(d->kactionListView, selectActionToBeExecutedMsg.arg(d->actionWidgetName), d->kactionPageWidget); @@ -595,13 +595,13 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item) vlyr->addWidget(d->kactionListView); d->secondAnd3rdColumnStack->addWidget(d->kactionPageWidget); connect(d->kactionListView, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotKActionItemExecuted(TQListViewItem*))); + this, TQT_SLOT(slotTDEActionItemExecuted(TQListViewItem*))); connect( d->kactionListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotKActionItemSelected(TQListViewItem*))); + this, TQT_SLOT(slotTDEActionItemSelected(TQListViewItem*))); } d->setActionToExecuteSectionVisible(false); d->raiseWidget(d->kactionPageWidget); - slotKActionItemSelected(d->kactionListView->selectedItem()); //to refresh column #3 + slotTDEActionItemSelected(d->kactionListView->selectedItem()); //to refresh column #3 } else if (simpleItem->data == "currentForm") { if (!d->currentFormActionsPageWidget) { diff --git a/kexi/plugins/forms/kexiactionselectiondialog.h b/kexi/plugins/forms/kexiactionselectiondialog.h index 8587287c..9d355562 100644 --- a/kexi/plugins/forms/kexiactionselectiondialog.h +++ b/kexi/plugins/forms/kexiactionselectiondialog.h @@ -24,14 +24,14 @@ #include "kexiformeventhandler.h" class KexiMainWindow; -class KListView; +class TDEListView; namespace KexiPart { class Item; } //! @short A dialog for selecting an action to be executed for a form's command button /*! Available actions are: - - application's global actions like "edit->copy" (KAction-based) + - application's global actions like "edit->copy" (TDEAction-based) - opening/printing/executing of selected object (table/query/form/script/macrto, etc.) */ class KEXIFORMUTILS_EXPORT KexiActionSelectionDialog : public KDialogBase @@ -54,8 +54,8 @@ class KEXIFORMUTILS_EXPORT KexiActionSelectionDialog : public KDialogBase protected slots: void slotActionCategorySelected(TQListViewItem* item); - void slotKActionItemExecuted(TQListViewItem*); - void slotKActionItemSelected(TQListViewItem*); + void slotTDEActionItemExecuted(TQListViewItem*); + void slotTDEActionItemSelected(TQListViewItem*); void slotActionToExecuteItemExecuted(TQListViewItem* item); void slotActionToExecuteItemSelected(TQListViewItem*); void slotCurrentFormActionItemExecuted(TQListViewItem*); diff --git a/kexi/plugins/forms/kexiactionselectiondialog_p.h b/kexi/plugins/forms/kexiactionselectiondialog_p.h index 741bd230..f0527132 100644 --- a/kexi/plugins/forms/kexiactionselectiondialog_p.h +++ b/kexi/plugins/forms/kexiactionselectiondialog_p.h @@ -23,7 +23,7 @@ #include <klistview.h> //! @internal -class ActionsListViewBase : public KListView +class ActionsListViewBase : public TDEListView { public: ActionsListViewBase(TQWidget* parent); @@ -34,14 +34,14 @@ class ActionsListViewBase : public KListView void selectAction(const TQString& actionName); }; -//! @internal Used by KActionsListView and CurrentFormActionsListView (in column 2) -class KActionsListViewBase : public ActionsListViewBase +//! @internal Used by TDEActionsListView and CurrentFormActionsListView (in column 2) +class TDEActionsListViewBase : public ActionsListViewBase { Q_OBJECT public: - KActionsListViewBase(TQWidget* parent, KexiMainWindow* mainWin); - virtual ~KActionsListViewBase(); + TDEActionsListViewBase(TQWidget* parent, KexiMainWindow* mainWin); + virtual ~TDEActionsListViewBase(); void init(); virtual bool isActionVisible(const char* actionName, int actionCategories) const = 0; diff --git a/kexi/plugins/forms/kexidatasourcepage.cpp b/kexi/plugins/forms/kexidatasourcepage.cpp index 5b7e46db..b89031a7 100644 --- a/kexi/plugins/forms/kexidatasourcepage.cpp +++ b/kexi/plugins/forms/kexidatasourcepage.cpp @@ -138,7 +138,7 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name) separator->setFrameShadow(TQFrame::Sunken); vlyr->addWidget(separator);*/ /* - KPopupTitle *title = new KPopupTitle(this); + TDEPopupTitle *title = new TDEPopupTitle(this); title->setTitle(i18n("Inserting fields")); vlyr->addWidget(title); vlyr->addSpacing(4);*/ diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp index bfc70226..8bb55bce 100644 --- a/kexi/plugins/forms/kexidbfactory.cpp +++ b/kexi/plugins/forms/kexidbfactory.cpp @@ -425,8 +425,8 @@ KexiDBFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQPopu { KexiDBImageBox *imageBox = static_cast<KexiDBImageBox*>(w); imageBox->contextMenu()->updateActionsAvailability(); - KActionCollection *ac = imageBox->contextMenu()->actionCollection(); - KPopupMenu *subMenu = new KPopupMenu(); + TDEActionCollection *ac = imageBox->contextMenu()->actionCollection(); + TDEPopupMenu *subMenu = new TDEPopupMenu(); //! @todo make these actions undoable/redoable menu->insertItem(i18n("&Image"), subMenu); ac->action("insert")->plug(subMenu); @@ -445,10 +445,10 @@ KexiDBFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQPopu } void -KexiDBFactory::createCustomActions(KActionCollection* col) +KexiDBFactory::createCustomActions(TDEActionCollection* col) { //this will create shared instance action for design mode (special collection is provided) - m_assignAction = new KAction( i18n("&Assign Action..."), SmallIconSet("form_action"), + m_assignAction = new TDEAction( i18n("&Assign Action..."), SmallIconSet("form_action"), 0, 0, 0, col, "widget_assign_action"); } diff --git a/kexi/plugins/forms/kexidbfactory.h b/kexi/plugins/forms/kexidbfactory.h index a5830593..6be965d5 100644 --- a/kexi/plugins/forms/kexidbfactory.h +++ b/kexi/plugins/forms/kexidbfactory.h @@ -23,7 +23,7 @@ #include <formeditor/widgetfactory.h> -class KAction; +class TDEAction; namespace KFormDesigner { class Form; @@ -43,7 +43,7 @@ class KexiDBFactory : public KFormDesigner::WidgetFactory virtual TQWidget *createWidget(const TQCString &classname, TQWidget *parent, const char *name, KFormDesigner::Container *container, int options = DefaultOptions ); - virtual void createCustomActions(KActionCollection* col); + virtual void createCustomActions(TDEActionCollection* col); virtual bool createMenuActions(const TQCString &classname, TQWidget *w, TQPopupMenu *menu, KFormDesigner::Container *container); virtual bool startEditing(const TQCString &classname, TQWidget *w, KFormDesigner::Container *container); @@ -69,7 +69,7 @@ class KexiDBFactory : public KFormDesigner::WidgetFactory virtual bool propertySetShouldBeReloadedAfterPropertyChange(const TQCString& classname, TQWidget *w, const TQCString& property); - KAction* m_assignAction; + TDEAction* m_assignAction; }; #endif diff --git a/kexi/plugins/forms/kexiformeventhandler.cpp b/kexi/plugins/forms/kexiformeventhandler.cpp index 55e999db..365f5cb4 100644 --- a/kexi/plugins/forms/kexiformeventhandler.cpp +++ b/kexi/plugins/forms/kexiformeventhandler.cpp @@ -70,7 +70,7 @@ KexiPart::Info* KexiFormEventAction::ActionData::decodeString( KexiFormEventAction::KexiFormEventAction(KexiMainWindow *mainWin, TQObject* parent, const TQString& actionName, const TQString& objectName, const TQString& actionOption) - : KAction(parent), m_mainWin(mainWin), m_actionName(actionName), m_objectName(objectName) + : TDEAction(parent), m_mainWin(mainWin), m_actionName(actionName), m_objectName(objectName) , m_actionOption(actionOption) { } @@ -171,7 +171,7 @@ void KexiFormEventHandler::setMainWidgetForEventHandling(KexiMainWindow *mainWin if (!ok) continue; if (actionType=="kaction" || actionType=="currentForm") { - KAction *action = mainWin->actionCollection()->action( actionArg.latin1() ); + TDEAction *action = mainWin->actionCollection()->action( actionArg.latin1() ); if (!action) continue; TQObject::disconnect( obj, TQT_SIGNAL(clicked()), action, TQT_SLOT(activate()) ); //safety diff --git a/kexi/plugins/forms/kexiformeventhandler.h b/kexi/plugins/forms/kexiformeventhandler.h index e882eeb8..69b9a20c 100644 --- a/kexi/plugins/forms/kexiformeventhandler.h +++ b/kexi/plugins/forms/kexiformeventhandler.h @@ -54,7 +54,7 @@ class KEXIFORMUTILS_EXPORT KexiFormEventHandler }; //! @internal form-level action for handling "on click" actions -class KEXIFORMUTILS_EXPORT KexiFormEventAction : public KAction +class KEXIFORMUTILS_EXPORT KexiFormEventAction : public TDEAction { public: //! A structure used in currentActionName() diff --git a/kexi/plugins/forms/kexiformmanager.cpp b/kexi/plugins/forms/kexiformmanager.cpp index 8c0c66e7..56d20376 100644 --- a/kexi/plugins/forms/kexiformmanager.cpp +++ b/kexi/plugins/forms/kexiformmanager.cpp @@ -51,13 +51,13 @@ KexiFormManager::~KexiFormManager() { } -KAction* KexiFormManager::action( const char* name ) +TDEAction* KexiFormManager::action( const char* name ) { - KActionCollection *col = m_part->actionCollectionForMode(Kexi::DesignViewMode); + TDEActionCollection *col = m_part->actionCollectionForMode(Kexi::DesignViewMode); if (!col) return 0; TQCString n( translateName( name ).latin1() ); - KAction *a = col->action(n.data()); + TDEAction *a = col->action(n.data()); if (a) return a; KexiDBForm *dbform; diff --git a/kexi/plugins/forms/kexiformmanager.h b/kexi/plugins/forms/kexiformmanager.h index baeb74d9..1e1b767c 100644 --- a/kexi/plugins/forms/kexiformmanager.h +++ b/kexi/plugins/forms/kexiformmanager.h @@ -37,7 +37,7 @@ class KEXIFORMUTILS_EXPORT KexiFormManager : public KFormDesigner::FormManager KexiFormManager(KexiPart::Part *parent, const char* name = 0); virtual ~KexiFormManager(); - virtual KAction* action( const char* name ); + virtual TDEAction* action( const char* name ); virtual void enableAction( const char* name, bool enable ); public slots: diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp index 911c3374..b96e4814 100644 --- a/kexi/plugins/forms/kexiformpart.cpp +++ b/kexi/plugins/forms/kexiformpart.cpp @@ -127,7 +127,7 @@ KFormDesigner::WidgetLibrary* KexiFormPart::library() } #if 0 -void KexiFormPart::initPartActions(KActionCollection *collection) +void KexiFormPart::initPartActions(TDEActionCollection *collection) { //this is automatic? -no //create child guicilent: guiClient()->setXMLFile("kexidatatableui.rc"); @@ -139,12 +139,12 @@ void KexiFormPart::initPartActions(KActionCollection *collection) //js m_manager->createActions(collection, 0); } -void KexiFormPart::initInstanceActions( int mode, KActionCollection *col ) +void KexiFormPart::initInstanceActions( int mode, TDEActionCollection *col ) { if (mode==Kexi::DesignViewMode) { KFormDesigner::FormManager::self()->createActions(col, 0); - new KAction(i18n("Edit Tab Order..."), "tab_order", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder()), col, "taborder"); - new KAction(i18n("Adjust Size"), "viewmagfit", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(ajustWidgetSize()), col, "adjust"); + new TDEAction(i18n("Edit Tab Order..."), "tab_order", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder()), col, "taborder"); + new TDEAction(i18n("Adjust Size"), "viewmagfit", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(ajustWidgetSize()), col, "adjust"); } //TODO } @@ -152,7 +152,7 @@ void KexiFormPart::initInstanceActions( int mode, KActionCollection *col ) void KexiFormPart::initPartActions() { -// new KAction(i18n("Show Form UI Code"), "show_form_ui", CTRL+Key_U, m_manager, TQT_SLOT(showFormUICode()), +// new TDEAction(i18n("Show Form UI Code"), "show_form_ui", CTRL+Key_U, m_manager, TQT_SLOT(showFormUICode()), // guiClient()->actionCollection(), "show_form_ui"); } @@ -161,13 +161,13 @@ void KexiFormPart::initInstanceActions() #ifdef KEXI_DEBUG_GUI kapp->config()->setGroup("General"); if (kapp->config()->readBoolEntry("showInternalDebugger", false)) { - new KAction(i18n("Show Form UI Code"), "compfile", + new TDEAction(i18n("Show Form UI Code"), "compfile", CTRL+Key_U, KFormDesigner::FormManager::self(), TQT_SLOT(showFormUICode()), actionCollectionForMode(Kexi::DesignViewMode), "show_form_ui"); } #endif - KActionCollection *col = actionCollectionForMode(Kexi::DesignViewMode); + TDEActionCollection *col = actionCollectionForMode(Kexi::DesignViewMode); KFormDesigner::FormManager::self()->createActions( library(), col, (KXMLGUIClient*)col->parentGUIClient() ); //guiClient() ); //connect actions provided by widget factories @@ -180,8 +180,8 @@ void KexiFormPart::initInstanceActions() // KFormDesigner::CreateLayoutCommand - KAction *action = createSharedAction(Kexi::DesignViewMode, i18n("Layout Widgets"), "", 0, "formpart_layout_menu", "KActionMenu"); - KActionMenu *menu = static_cast<KActionMenu*>(action); + TDEAction *action = createSharedAction(Kexi::DesignViewMode, i18n("Layout Widgets"), "", 0, "formpart_layout_menu", "TDEActionMenu"); + TDEActionMenu *menu = static_cast<TDEActionMenu*>(action); menu->insert( createSharedAction(Kexi::DesignViewMode, i18n("&Horizontally"), TQString(), 0, "formpart_layout_hbox")); @@ -206,19 +206,19 @@ void KexiFormPart::initInstanceActions() createSharedAction(Kexi::DesignViewMode, i18n("Send Widget to Back"), "lower", 0, "formpart_format_lower"); #ifndef KEXI_NO_UNFINISHED - action = createSharedAction(Kexi::DesignViewMode, i18n("Other Widgets"), "", 0, "other_widgets_menu", "KActionMenu"); + action = createSharedAction(Kexi::DesignViewMode, i18n("Other Widgets"), "", 0, "other_widgets_menu", "TDEActionMenu"); #endif - action = createSharedAction(Kexi::DesignViewMode, i18n("Align Widgets Position"), "aoleft", 0, "formpart_align_menu", "KActionMenu"); - menu = static_cast<KActionMenu*>(action); + action = createSharedAction(Kexi::DesignViewMode, i18n("Align Widgets Position"), "aoleft", 0, "formpart_align_menu", "TDEActionMenu"); + menu = static_cast<TDEActionMenu*>(action); menu->insert( createSharedAction(Kexi::DesignViewMode, i18n("To Left"), "aoleft", 0, "formpart_align_to_left") ); menu->insert( createSharedAction(Kexi::DesignViewMode, i18n("To Right"), "aoright", 0, "formpart_align_to_right") ); menu->insert( createSharedAction(Kexi::DesignViewMode, i18n("To Top"), "aotop", 0, "formpart_align_to_top") ); menu->insert( createSharedAction(Kexi::DesignViewMode, i18n("To Bottom"), "aobottom", 0, "formpart_align_to_bottom") ); menu->insert( createSharedAction(Kexi::DesignViewMode, i18n("To Grid"), "aopos2grid", 0, "formpart_align_to_grid") ); - action = createSharedAction(Kexi::DesignViewMode, i18n("Adjust Widgets Size"), "aogrid", 0, "formpart_adjust_size_menu", "KActionMenu"); - menu = static_cast<KActionMenu*>(action); + action = createSharedAction(Kexi::DesignViewMode, i18n("Adjust Widgets Size"), "aogrid", 0, "formpart_adjust_size_menu", "TDEActionMenu"); + menu = static_cast<TDEActionMenu*>(action); menu->insert( createSharedAction(Kexi::DesignViewMode, i18n("To Fit"), "aofit", 0, "formpart_adjust_to_fit") ); menu->insert( createSharedAction(Kexi::DesignViewMode, i18n("To Grid"), "aogrid", 0, "formpart_adjust_size_grid") ); menu->insert( createSharedAction(Kexi::DesignViewMode, i18n("To Shortest"), "aoshortest", 0, "formpart_adjust_height_small") ); diff --git a/kexi/plugins/forms/kexiformscrollview.cpp b/kexi/plugins/forms/kexiformscrollview.cpp index b4b58f70..b73cf8ea 100644 --- a/kexi/plugins/forms/kexiformscrollview.cpp +++ b/kexi/plugins/forms/kexiformscrollview.cpp @@ -51,7 +51,7 @@ KexiFormScrollView::KexiFormScrollView(TQWidget *parent, bool preview) connect(this, TQT_SIGNAL(resizingStarted()), this, TQT_SLOT(slotResizingStarted())); - m_popupMenu = new KPopupMenu(this, "contextMenu"); + m_popupMenu = new TDEPopupMenu(this, "contextMenu"); // setFocusPolicy(NoFocus); } diff --git a/kexi/plugins/forms/widgets/kexidbdateedit.cpp b/kexi/plugins/forms/widgets/kexidbdateedit.cpp index daff9ef9..cf8c1d70 100644 --- a/kexi/plugins/forms/widgets/kexidbdateedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbdateedit.cpp @@ -52,7 +52,7 @@ KexiDBDateEdit::KexiDBDateEdit(const TQDate &date, TQWidget *parent, const char m_dte_date = 0; #endif - m_datePickerPopupMenu = new KPopupMenu(0, "date_popup"); + m_datePickerPopupMenu = new TDEPopupMenu(0, "date_popup"); connect(m_datePickerPopupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotShowDatePicker())); m_datePicker = new KDatePicker(m_datePickerPopupMenu, TQDate::currentDate(), 0); diff --git a/kexi/plugins/forms/widgets/kexidbdateedit.h b/kexi/plugins/forms/widgets/kexidbdateedit.h index a9ddd6a3..638b985a 100644 --- a/kexi/plugins/forms/widgets/kexidbdateedit.h +++ b/kexi/plugins/forms/widgets/kexidbdateedit.h @@ -24,7 +24,7 @@ #include "kexiformdataiteminterface.h" #include <tqdatetimeedit.h> -class KPopupMenu; +class TDEPopupMenu; class KDatePicker; class TQDateTimeEditor; @@ -109,7 +109,7 @@ class KEXIFORMUTILS_EXPORT KexiDBDateEdit : public TQWidget, public KexiFormData private: KDatePicker *m_datePicker; TQDateEdit *m_edit; - KPopupMenu *m_datePickerPopupMenu; + TDEPopupMenu *m_datePickerPopupMenu; TQDateTimeEditor *m_dte_date; bool m_invalidState : 1; bool m_cleared : 1; diff --git a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp index 627e1172..763bdf02 100644 --- a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp @@ -59,7 +59,7 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par m_dte_date = 0; #endif - m_datePickerPopupMenu = new KPopupMenu(0, "date_popup"); + m_datePickerPopupMenu = new TDEPopupMenu(0, "date_popup"); connect(m_datePickerPopupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotShowDatePicker())); m_datePicker = new KDatePicker(m_datePickerPopupMenu, TQDate::currentDate(), 0); diff --git a/kexi/plugins/forms/widgets/kexidbdatetimeedit.h b/kexi/plugins/forms/widgets/kexidbdatetimeedit.h index c7080a1e..a56bb30e 100644 --- a/kexi/plugins/forms/widgets/kexidbdatetimeedit.h +++ b/kexi/plugins/forms/widgets/kexidbdatetimeedit.h @@ -26,7 +26,7 @@ class KDatePicker; class TQDateTimeEditor; -class KPopupMenu; +class TDEPopupMenu; //! @short A db-aware datetime editor class KEXIFORMUTILS_EXPORT KexiDBDateTimeEdit : public TQWidget, public KexiFormDataItemInterface @@ -98,7 +98,7 @@ class KEXIFORMUTILS_EXPORT KexiDBDateTimeEdit : public TQWidget, public KexiForm TQDateEdit* m_dateEdit; TQTimeEdit* m_timeEdit; TQDateTimeEditor *m_dte_date, *m_dte_time; - KPopupMenu *m_datePickerPopupMenu; + TDEPopupMenu *m_datePickerPopupMenu; bool m_invalidState : 1; bool m_cleared : 1; bool m_readOnly : 1; diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp index 97d36055..eaf91044 100644 --- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp +++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp @@ -779,7 +779,7 @@ bool KexiDBImageBox::keyPressed(TQKeyEvent *ke) return true; } } -// else if (ke->state() == TQt::ControlButton && KStdAccel::shortcut(KStdAccel::Copy).keyCodeTQt() == (ke->key()|TQt::CTRL)) { +// else if (ke->state() == TQt::ControlButton && TDEStdAccel::shortcut(TDEStdAccel::Copy).keyCodeTQt() == (ke->key()|TQt::CTRL)) { // } return false; } diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.h b/kexi/plugins/forms/widgets/kexidbimagebox.h index 93e7e244..e7a46329 100644 --- a/kexi/plugins/forms/widgets/kexidbimagebox.h +++ b/kexi/plugins/forms/widgets/kexidbimagebox.h @@ -254,8 +254,8 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox : // TQString m_originalFileName; KexiDropDownButton *m_chooser; KexiImageContextMenu *m_popupMenu; -//moved KActionCollection m_actionCollection; -//moved KAction *m_insertFromFileAction, *m_saveAsAction, *m_cutAction, *m_copyAction, *m_pasteAction, +//moved TDEActionCollection m_actionCollection; +//moved TDEAction *m_insertFromFileAction, *m_saveAsAction, *m_cutAction, *m_copyAction, *m_pasteAction, // *m_deleteAction, *m_propertiesAction; // TQTimer m_clickTimer; int m_alignment; diff --git a/kexi/plugins/forms/widgets/kexidbtextedit.cpp b/kexi/plugins/forms/widgets/kexidbtextedit.cpp index b6ab6b03..de928e37 100644 --- a/kexi/plugins/forms/widgets/kexidbtextedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbtextedit.cpp @@ -199,7 +199,7 @@ void KexiDBTextEdit::selectAll() void KexiDBTextEdit::keyPressEvent( TQKeyEvent *ke ) { // for instance, Windows uses Ctrl+Tab for moving between tabs, so do not steal this shortcut - if (KStdAccel::tabNext().contains( KKey(ke) ) || KStdAccel::tabPrev().contains( KKey(ke) )) { + if (TDEStdAccel::tabNext().contains( KKey(ke) ) || TDEStdAccel::tabPrev().contains( KKey(ke) )) { ke->ignore(); return; } diff --git a/kexi/plugins/forms/widgets/kexidbutils.cpp b/kexi/plugins/forms/widgets/kexidbutils.cpp index 3f12b3dd..863b5d80 100644 --- a/kexi/plugins/forms/widgets/kexidbutils.cpp +++ b/kexi/plugins/forms/widgets/kexidbutils.cpp @@ -53,7 +53,7 @@ void KexiDBWidgetContextMenuExtender::createTitle(TQPopupMenu *menu) if (!menu) return; m_contextMenu = menu; - KPopupTitle *titleItem = new KPopupTitle(); + TDEPopupTitle *titleItem = new TDEPopupTitle(); const int id = m_contextMenu->insertItem(titleItem, -1, 0); m_contextMenu->setItemEnabled(id, false); TQString icon; diff --git a/kexi/plugins/forms/widgets/kexidbutils.h b/kexi/plugins/forms/widgets/kexidbutils.h index f4100c73..ceac5975 100644 --- a/kexi/plugins/forms/widgets/kexidbutils.h +++ b/kexi/plugins/forms/widgets/kexidbutils.h @@ -50,7 +50,7 @@ class KexiDBWidgetContextMenuExtender : public TQObject protected: KexiDataItemInterface* m_iface; TQGuardedPtr<TQPopupMenu> m_contextMenu; - bool m_contextMenuHasTitle; //!< true if KPopupTitle has been added to the context menu. + bool m_contextMenuHasTitle; //!< true if TDEPopupTitle has been added to the context menu. }; class KexiDBAutoField; diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp index 941f8eda..20fba8fe 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp @@ -318,7 +318,7 @@ if ( m_mode == Clipboard ) KURL url; url.setPath( m_fname ); if (url.isLocalFile()) - KRecentDirs::add(":CSVImportExport", url.directory()); + TDERecentDirs::add(":CSVImportExport", url.directory()); } #else m_fname = KFileDialog::getOpenFileName(":CSVImportExport", mimetypes.join(" "), diff --git a/kexi/plugins/macros/kexipart/keximacroerror.cpp b/kexi/plugins/macros/kexipart/keximacroerror.cpp index 6c35e8d7..a512994d 100644 --- a/kexi/plugins/macros/kexipart/keximacroerror.cpp +++ b/kexi/plugins/macros/kexipart/keximacroerror.cpp @@ -59,7 +59,7 @@ KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, TDESharedPtr<KoMacro::Co KoMacro::MacroItem::List items = context->macro()->items(); for (KoMacro::MacroItem::List::ConstIterator mit = items.begin(); mit != items.end(); mit++) { - KListViewItem* listviewitem = new KListViewItem(errorlist); + TDEListViewItem* listviewitem = new TDEListViewItem(errorlist); listviewitem->setText(0,TQString("%1").arg(i++)); listviewitem->setText(1,i18n("Action")); TDESharedPtr<KoMacro::MacroItem> macroitem = *mit; @@ -80,7 +80,7 @@ KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, TDESharedPtr<KoMacro::Co KoMacro::Variable::Map variables = macroitem->variables(); KoMacro::Variable::Map::ConstIterator vit; for ( vit = variables.begin(); vit != variables.end(); ++vit ) { - KListViewItem* child = new KListViewItem(listviewitem); + TDEListViewItem* child = new TDEListViewItem(listviewitem); child->setText(1,vit.key()); child->setText(2,vit.data()->toString()); } diff --git a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui index 05d7ba72..707b2cb3 100644 --- a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui +++ b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui @@ -93,7 +93,7 @@ </widget> </hbox> </widget> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>No</string> diff --git a/kexi/plugins/macros/kexipart/keximacropart.h b/kexi/plugins/macros/kexipart/keximacropart.h index f8109364..197676e9 100644 --- a/kexi/plugins/macros/kexipart/keximacropart.h +++ b/kexi/plugins/macros/kexipart/keximacropart.h @@ -50,7 +50,7 @@ class KexiMacroPart : public KexiPart::Part /** * Implementation of the KexiPart::Part::action method used to - * provide scripts as KAction's to the outside world. + * provide scripts as TDEAction's to the outside world. */ virtual bool execute(KexiPart::Item* item, TQObject* sender = 0); diff --git a/kexi/plugins/macros/lib/action.h b/kexi/plugins/macros/lib/action.h index c779f21a..0b19ef46 100644 --- a/kexi/plugins/macros/lib/action.h +++ b/kexi/plugins/macros/lib/action.h @@ -32,8 +32,8 @@ namespace KoMacro { /** - * The Action class extendes KAction to implement some additional - * functionality KAction doesn't provide. + * The Action class extendes TDEAction to implement some additional + * functionality TDEAction doesn't provide. */ class KOMACRO_EXPORT Action : public TQObject // TQt functionality like signals and slots diff --git a/kexi/plugins/macros/lib/manager.h b/kexi/plugins/macros/lib/manager.h index 5e3ce084..5abddeae 100644 --- a/kexi/plugins/macros/lib/manager.h +++ b/kexi/plugins/macros/lib/manager.h @@ -48,8 +48,8 @@ namespace KoMacro { * // got published. * class PublishedObject : public TQObject {}; * - * // Somewhere we have our KMainWindow. - * KMainWindow* mainwindow = new KMainWindow(); + * // Somewhere we have our TDEMainWindow. + * TDEMainWindow* mainwindow = new TDEMainWindow(); * * // Create a new KoMacro::Manager instance to access the * // Macro-framework. diff --git a/kexi/plugins/queries/kexiparameterlisteditor.ui b/kexi/plugins/queries/kexiparameterlisteditor.ui index 26b7d0f2..7741073f 100644 --- a/kexi/plugins/queries/kexiparameterlisteditor.ui +++ b/kexi/plugins/queries/kexiparameterlisteditor.ui @@ -24,7 +24,7 @@ <string>Parameters:</string> </property> </widget> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>Name</string> diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp index 5de13fe2..650e90a6 100644 --- a/kexi/plugins/queries/kexiquerydesignersql.cpp +++ b/kexi/plugins/queries/kexiquerydesignersql.cpp @@ -79,7 +79,7 @@ class KexiQueryDesignerSQLView::Private KexiSectionHeader *head, *historyHead; TQPixmap statusPixmapOk, statusPixmapErr, statusPixmapInfo; TQSplitter *splitter; - KToggleAction *action_toggle_history; + TDEToggleAction *action_toggle_history; //! For internal use, this pointer is usually copied to TempData structure, //! when switching out of this view (then it's cleared). KexiDB::QuerySchema *parsedQuery; @@ -138,7 +138,7 @@ KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWi plugSharedAction("querypart_check_query", TQT_TQOBJECT(this), TQT_SLOT(slotCheckQuery())); plugSharedAction("querypart_view_toggle_history", TQT_TQOBJECT(this), TQT_SLOT(slotUpdateMode())); - d->action_toggle_history = static_cast<KToggleAction*>( sharedAction( "querypart_view_toggle_history" ) ); + d->action_toggle_history = static_cast<TDEToggleAction*>( sharedAction( "querypart_view_toggle_history" ) ); d->historyHead = new KexiSectionHeader(i18n("SQL Query History"),Qt::Vertical, d->history_section); d->historyHead->installEventFilter(this); diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp index 81bb22bc..da27f890 100644 --- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp +++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp @@ -40,7 +40,7 @@ KexiQueryDesignerSQLHistory::KexiQueryDesignerSQLHistory(TQWidget *parent, const m_history = new History(); m_history->setAutoDelete(true); - m_popup = new KPopupMenu(this); + m_popup = new TDEPopupMenu(this); m_popup->insertItem(SmallIcon("editcopy"), i18n("Copy to Clipboard"), this, TQT_SLOT(slotToClipboard())); } @@ -161,7 +161,7 @@ KexiQueryDesignerSQLHistory::addEntry(HistoryEntry *e) /*void KexiQueryDesignerSQLHistory::contextMenu(const TQPoint &pos, HistoryEntry *) { - KPopupMenu p(this); + TDEPopupMenu p(this); p.insertItem(SmallIcon("editcopy"), i18n("Copy to Clipboard"), this, TQT_SLOT(slotToClipboard())); @@ -209,7 +209,7 @@ void KexiQueryDesignerSQLHistory::clear() updateContents(); } -KPopupMenu* KexiQueryDesignerSQLHistory::popupMenu() const +TDEPopupMenu* KexiQueryDesignerSQLHistory::popupMenu() const { return m_popup; } diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.h b/kexi/plugins/queries/kexiquerydesignersqlhistory.h index 9183764f..516a6dbf 100644 --- a/kexi/plugins/queries/kexiquerydesignersqlhistory.h +++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.h @@ -28,7 +28,7 @@ #include <tqsimplerichtext.h> class TQSimpleRichText; -class KPopupMenu; +class TDEPopupMenu; class HistoryEntry { @@ -68,7 +68,7 @@ class KexiQueryDesignerSQLHistory : public TQScrollView KexiQueryDesignerSQLHistory(TQWidget *parent, const char *name=0); virtual ~KexiQueryDesignerSQLHistory(); - KPopupMenu* popupMenu() const; + TDEPopupMenu* popupMenu() const; // void contextMenu(const TQPoint &pos, HistoryEntry *e); @@ -99,7 +99,7 @@ class KexiQueryDesignerSQLHistory : public TQScrollView private: History *m_history; HistoryEntry *m_selected; - KPopupMenu *m_popup; + TDEPopupMenu *m_popup; }; #endif diff --git a/kexi/plugins/queries/kexiquerypart.cpp b/kexi/plugins/queries/kexiquerypart.cpp index d0c71eae..02c4ab94 100644 --- a/kexi/plugins/queries/kexiquerypart.cpp +++ b/kexi/plugins/queries/kexiquerypart.cpp @@ -117,20 +117,20 @@ KexiQueryPart::dataSource() return new KexiQueryDataSource(this); } -void KexiQueryPart::initPartActions( KActionCollection *col ) +void KexiQueryPart::initPartActions( TDEActionCollection *col ) { } -void KexiQueryPart::initInstanceActions( int mode, KActionCollection *col ) +void KexiQueryPart::initInstanceActions( int mode, TDEActionCollection *col ) { if (mode==Kexi::DataViewMode) { } else if (mode==Kexi::DesignViewMode) { } else if (mode==Kexi::TextViewMode) { -// new KAction(i18n("Check Query"), "test_it", 0, this, TQT_SLOT(slotCheckQuery()), col, "querypart_check_query"); +// new TDEAction(i18n("Check Query"), "test_it", 0, this, TQT_SLOT(slotCheckQuery()), col, "querypart_check_query"); -//TODO new KAction(i18n("Execute Query"), "?????", 0, this, TQT_SLOT(checkQuery()), col, "querypart_execute_query"); +//TODO new TDEAction(i18n("Execute Query"), "?????", 0, this, TQT_SLOT(checkQuery()), col, "querypart_execute_query"); } } #endif @@ -141,10 +141,10 @@ void KexiQueryPart::initPartActions() void KexiQueryPart::initInstanceActions() { -// new KAction(i18n("Check Query"), "test_it", 0, this, TQT_SLOT(slotCheckQuery()), +// new TDEAction(i18n("Check Query"), "test_it", 0, this, TQT_SLOT(slotCheckQuery()), // m_instanceGuiClients[Kexi::DesignViewMode]->actionCollection(), "querypart_check_query"); - KAction *a = createSharedAction(Kexi::TextViewMode, i18n("Check Query"), "test_it", + TDEAction *a = createSharedAction(Kexi::TextViewMode, i18n("Check Query"), "test_it", Key_F9, "querypart_check_query"); a->setToolTip(i18n("Check Query")); a->setWhatsThis(i18n("Checks query for validity.")); diff --git a/kexi/plugins/queries/kexiquerypart.h b/kexi/plugins/queries/kexiquerypart.h index 33399c56..3587388c 100644 --- a/kexi/plugins/queries/kexiquerypart.h +++ b/kexi/plugins/queries/kexiquerypart.h @@ -105,8 +105,8 @@ class KexiQueryPart : public KexiPart::Part virtual KexiViewBase* createView(TQWidget *parent, KexiDialogBase* dialog, KexiPart::Item &item, int viewMode = Kexi::DataViewMode, TQMap<TQString,TQString>* staticObjectArgs = 0); -// virtual void initPartActions( KActionCollection *col ); -// virtual void initInstanceActions( int mode, KActionCollection *col ); +// virtual void initPartActions( TDEActionCollection *col ); +// virtual void initInstanceActions( int mode, TDEActionCollection *col ); virtual void initPartActions(); virtual void initInstanceActions(); diff --git a/kexi/plugins/reports/kexireportfactory.cpp b/kexi/plugins/reports/kexireportfactory.cpp index 7cf7dae9..cf54b254 100644 --- a/kexi/plugins/reports/kexireportfactory.cpp +++ b/kexi/plugins/reports/kexireportfactory.cpp @@ -120,7 +120,7 @@ KexiReportFactory::createMenuActions(const TQCString &classname, TQWidget *w, Q_UNUSED(w); Q_UNUSED(container); if(classname == "Label") { - /*! @todo use KAction */ + /*! @todo use TDEAction */ menu->insertItem(SmallIconSet("edit"), i18n("Edit Rich Text"), this, TQT_SLOT(editText())); return true; } diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp index 0b096b82..1c24db1b 100644 --- a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp +++ b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp @@ -126,25 +126,25 @@ void KexiScriptPart::initPartActions() if(! Kross::Api::Manager::scriptManager()->hasChild("KexiMainWindow")) { Kross::Api::Manager::scriptManager()->addTQObject(TQT_TQOBJECT(m_mainWin), "KexiMainWindow"); - // Add the KAction's provided by the ScriptGUIClient to the + // Add the TDEAction's provided by the ScriptGUIClient to the // KexiMainWindow. //FIXME: fix+use createSharedPartAction() whyever it doesn't work as expected right now... TQPopupMenu* popup = m_mainWin->findPopupMenu("tools"); if(popup) { - KAction* execscriptaction = d->scriptguiclient->action("executescriptfile"); + TDEAction* execscriptaction = d->scriptguiclient->action("executescriptfile"); if(execscriptaction) execscriptaction->plug( popup ); - KAction* configscriptaction = d->scriptguiclient->action("configurescripts"); + TDEAction* configscriptaction = d->scriptguiclient->action("configurescripts"); if(configscriptaction) configscriptaction->plug( popup ); - KAction* scriptmenuaction = d->scriptguiclient->action("installedscripts"); + TDEAction* scriptmenuaction = d->scriptguiclient->action("installedscripts"); if(scriptmenuaction) scriptmenuaction->plug( popup ); /* - KAction* execscriptmenuaction = d->scriptguiclient->action("executedscripts"); + TDEAction* execscriptmenuaction = d->scriptguiclient->action("executedscripts"); if(execscriptmenuaction) execscriptmenuaction->plug( popup ); - KAction* loadedscriptmenuaction = d->scriptguiclient->action("loadedscripts"); + TDEAction* loadedscriptmenuaction = d->scriptguiclient->action("loadedscripts"); if(loadedscriptmenuaction) loadedscriptmenuaction->plug( popup ); */ diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp index 6130a93f..62ab4cbf 100644 --- a/kexi/plugins/tables/kexitabledesignerview.cpp +++ b/kexi/plugins/tables/kexitabledesignerview.cpp @@ -175,12 +175,12 @@ KexiTableDesignerView::KexiTableDesignerView(KexiMainWindow *win, TQWidget *pare connect(d->sets, TQT_SIGNAL(rowDeleted()), TQT_TQOBJECT(this), TQT_SLOT(updateActions())); connect(d->sets, TQT_SIGNAL(rowInserted()), TQT_TQOBJECT(this), TQT_SLOT(slotRowInserted())); - d->contextMenuTitle = new KPopupTitle(d->view->contextMenu()); + d->contextMenuTitle = new TDEPopupTitle(d->view->contextMenu()); d->view->contextMenu()->insertItem(d->contextMenuTitle, -1, 0); connect(d->view->contextMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(slotAboutToShowContextMenu())); plugSharedAction("tablepart_toggle_pkey", TQT_TQOBJECT(this), TQT_SLOT(slotTogglePrimaryKey())); - d->action_toggle_pkey = static_cast<KToggleAction*>( sharedAction("tablepart_toggle_pkey") ); + d->action_toggle_pkey = static_cast<TDEToggleAction*>( sharedAction("tablepart_toggle_pkey") ); d->action_toggle_pkey->plug(d->view->contextMenu(), 1); //add at the beginning d->view->contextMenu()->insertSeparator(2); setAvailable("tablepart_toggle_pkey", !conn->isReadOnly()); diff --git a/kexi/plugins/tables/kexitabledesignerview_p.cpp b/kexi/plugins/tables/kexitabledesignerview_p.cpp index c546327b..a9254ba4 100644 --- a/kexi/plugins/tables/kexitabledesignerview_p.cpp +++ b/kexi/plugins/tables/kexitabledesignerview_p.cpp @@ -53,7 +53,7 @@ using namespace KexiTableDesignerCommands; //---------------------------------------------- -CommandHistory::CommandHistory(KActionCollection *actionCollection, bool withMenus) +CommandHistory::CommandHistory(TDEActionCollection *actionCollection, bool withMenus) : KCommandHistory(actionCollection, withMenus) { // We need ALL the commands because we'll collect reuse their @@ -109,7 +109,7 @@ KexiTableDesignerViewPrivate::KexiTableDesignerViewPrivate(KexiTableDesignerView , slotBeforeCellChanged_enabled(true) , tempStoreDataUsingRealAlterTable(false) { - historyActionCollection = new KActionCollection((TQWidget*)0,""); + historyActionCollection = new TDEActionCollection((TQWidget*)0,""); history = new CommandHistory(historyActionCollection, true); internalPropertyNames.insert("subType",(char*)1); diff --git a/kexi/plugins/tables/kexitabledesignerview_p.h b/kexi/plugins/tables/kexitabledesignerview_p.h index 206c295c..0b689d64 100644 --- a/kexi/plugins/tables/kexitabledesignerview_p.h +++ b/kexi/plugins/tables/kexitabledesignerview_p.h @@ -52,7 +52,7 @@ class CommandHistory : public KCommandHistory Q_OBJECT public: - CommandHistory(KActionCollection *actionCollection, bool withMenus = true); + CommandHistory(TDEActionCollection *actionCollection, bool withMenus = true); const TQPtrList<KCommand>& commands() const { return m_commandsToUndo; } @@ -141,9 +141,9 @@ class KexiTableDesignerViewPrivate int row; //!< used to know if a new row is selected in slotCellSelected() - KToggleAction *action_toggle_pkey; + TDEToggleAction *action_toggle_pkey; - KPopupTitle *contextMenuTitle; + TDEPopupTitle *contextMenuTitle; int uniqueIdCounter; @@ -181,7 +181,7 @@ class KexiTableDesignerViewPrivate to know what return value should be. */ tristate recentResultOfStoreData; - KActionCollection* historyActionCollection; + TDEActionCollection* historyActionCollection; CommandHistory* history; //! A cache used in KexiTableDesignerView::buildField() to quickly identify diff --git a/kexi/plugins/tables/kexitablepart.cpp b/kexi/plugins/tables/kexitablepart.cpp index 55c8be5d..07541f4d 100644 --- a/kexi/plugins/tables/kexitablepart.cpp +++ b/kexi/plugins/tables/kexitablepart.cpp @@ -85,7 +85,7 @@ void KexiTablePart::initInstanceActions() { //moved to main window createSharedAction(Kexi::DataViewMode, i18n("Filter"), "filter", 0, "tablepart_filter"); - KAction *a = createSharedToggleAction( + TDEAction *a = createSharedToggleAction( Kexi::DesignViewMode, i18n("Primary Key"), "key", 0, "tablepart_toggle_pkey"); // Kexi::DesignViewMode, i18n("Toggle Primary Key"), "key", 0, "tablepart_toggle_pkey"); a->setWhatsThis(i18n("Sets or removes primary key for currently selected field.")); diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp index 472dd25c..00586a53 100644 --- a/kexi/widget/kexibrowser.cpp +++ b/kexi/widget/kexibrowser.cpp @@ -72,7 +72,7 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features : TQWidget(parent, "KexiBrowser") , m_mainWin(mainWin) , m_features(features) - , m_actions( new KActionCollection(this) ) + , m_actions( new TDEActionCollection(this) ) , m_baseItems(199, false) , m_normalItems(199) , m_prevSelectedPart(0) @@ -103,8 +103,8 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features m_list->setTooltipColumn(0); m_list->renameLineEdit()->setValidator( new KexiUtils::IdentifierValidator(TQT_TQOBJECT(this)) ); m_list->setResizeMode(TQListView::LastColumn); - connect(m_list, TQT_SIGNAL(contextMenu(KListView *, TQListViewItem *, const TQPoint &)), - TQT_TQOBJECT(this), TQT_SLOT(slotContextMenu(KListView*, TQListViewItem *, const TQPoint&))); + connect(m_list, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)), + TQT_TQOBJECT(this), TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem *, const TQPoint&))); connect(m_list, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotSelectionChanged(TQListViewItem*))); @@ -123,7 +123,7 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features } // actions - m_openAction = new KAction(i18n("&Open"), "fileopen", 0/*TQt::Key_Enter conflict!*/, TQT_TQOBJECT(this), + m_openAction = new TDEAction(i18n("&Open"), "fileopen", 0/*TQt::Key_Enter conflict!*/, TQT_TQOBJECT(this), TQT_SLOT(slotOpenObject()), TQT_TQOBJECT(this), "open_object"); m_openAction->setToolTip(i18n("Open object")); m_openAction->setWhatsThis(i18n("Opens object selected in the list")); @@ -145,12 +145,12 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features m_newObjectPopup = 0; } else { - m_deleteAction = new KAction(i18n("&Delete"), "editdelete", 0/*TQt::Key_Delete*/, + m_deleteAction = new TDEAction(i18n("&Delete"), "editdelete", 0/*TQt::Key_Delete*/, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), m_actions, "edit_delete"); //! @todo 1.1: just add "Delete" tooltip and what's this m_deleteAction->setToolTip(i18n("&Delete").replace("&","")); - m_renameAction = new KAction(i18n("&Rename"), "", 0, + m_renameAction = new TDEAction(i18n("&Rename"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRename()), m_actions, "edit_rename"); #ifdef KEXI_SHOW_UNIMPLEMENTED //todo plugSharedAction("edit_cut",TQT_SLOT(slotCut())); @@ -158,7 +158,7 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features //todo plugSharedAction("edit_paste",TQT_SLOT(slotPaste())); #endif - m_designAction = new KAction(i18n("&Design"), "edit", 0/*TQt::CTRL + TQt::Key_Enter conflict!*/, TQT_TQOBJECT(this), + m_designAction = new TDEAction(i18n("&Design"), "edit", 0/*TQt::CTRL + TQt::Key_Enter conflict!*/, TQT_TQOBJECT(this), TQT_SLOT(slotDesignObject()), TQT_TQOBJECT(this), "design_object"); m_designAction->setToolTip(i18n("Design object")); m_designAction->setWhatsThis(i18n("Starts designing of the object selected in the list")); @@ -167,15 +167,15 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features buttons_flyr->add(btn); } - m_editTextAction = new KAction(i18n("Open in &Text View"), "", 0, TQT_TQOBJECT(this), + m_editTextAction = new TDEAction(i18n("Open in &Text View"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditTextObject()), TQT_TQOBJECT(this), "editText_object"); m_editTextAction->setToolTip(i18n("Open object in text view")); m_editTextAction->setWhatsThis(i18n("Opens selected object in the list in text view")); - m_newObjectAction = new KAction("", "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewObject()), TQT_TQOBJECT(this), "new_object"); + m_newObjectAction = new TDEAction("", "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewObject()), TQT_TQOBJECT(this), "new_object"); if (m_features & Toolbar) { m_newObjectToolButton = new KexiSmallToolButton(this, "", TQIconSet(), "new_object"); - m_newObjectPopup = new KPopupMenu(this, "newObjectPopup"); + m_newObjectPopup = new TDEPopupMenu(this, "newObjectPopup"); connect(m_newObjectPopup, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(slotNewObjectPopupAboutToShow())); // KexiPart::Part* part = Kexi::partManager().part("kexi/table"); // m_newObjectPopup->insertItem( SmallIconSet(part->info()->createItemIcon()), part->instanceName() ); @@ -190,21 +190,21 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features } } - m_executeAction = new KAction(i18n("Execute"), "player_play", 0, TQT_TQOBJECT(this), + m_executeAction = new TDEAction(i18n("Execute"), "player_play", 0, TQT_TQOBJECT(this), TQT_SLOT(slotExecuteObject()), TQT_TQOBJECT(this), "data_execute"); - m_exportActionMenu = new KActionMenu(i18n("Export")); - m_dataExportAction = new KAction(i18n("Export->To File as Data &Table... ", "To &File as Data Table..."), + m_exportActionMenu = new TDEActionMenu(i18n("Export")); + m_dataExportAction = new TDEAction(i18n("Export->To File as Data &Table... ", "To &File as Data Table..."), "table", 0, TQT_TQOBJECT(this), TQT_SLOT(slotExportAsDataTable()), TQT_TQOBJECT(this), "exportAsDataTable"); m_dataExportAction->setWhatsThis( i18n("Exports data from the currently selected table or query data to a file.")); m_exportActionMenu->insert( m_dataExportAction ); - m_printAction = new KAction(i18n("&Print..."), "fileprint", 0, TQT_TQOBJECT(this), + m_printAction = new TDEAction(i18n("&Print..."), "fileprint", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPrintItem()), TQT_TQOBJECT(this), "printItem"); m_printAction->setWhatsThis( i18n("Prints data from the currently selected table or query.")); - m_pageSetupAction = new KAction(i18n("Page Setup..."), "", 0, TQT_TQOBJECT(this), + m_pageSetupAction = new TDEAction(i18n("Page Setup..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPageSetupForItem()), TQT_TQOBJECT(this), "pageSetupForItem"); m_pageSetupAction->setWhatsThis( i18n("Shows page setup for printing the active table or query.")); @@ -214,7 +214,7 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features m_partPopup = 0; } else { - m_partPopup = new KPopupMenu(this, "partPopup"); + m_partPopup = new TDEPopupMenu(this, "partPopup"); m_partPopupTitle_id = m_partPopup->insertTitle(""); m_newObjectAction->plug(m_partPopup); #ifdef KEXI_SHOW_UNIMPLEMENTED @@ -225,7 +225,7 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features if (m_features & ContextMenus) { //init popups - m_itemPopup = new KPopupMenu(this, "itemPopup"); + m_itemPopup = new TDEPopupMenu(this, "itemPopup"); m_itemPopupTitle_id = m_itemPopup->insertTitle(""); m_openAction->plug(m_itemPopup); m_openAction_id = m_itemPopup->idAt(m_itemPopup->count()-1); @@ -411,12 +411,12 @@ KexiBrowser::slotRemoveItem(const KexiPart::Item &item) } void -KexiBrowser::slotContextMenu(KListView* /*list*/, TQListViewItem *item, const TQPoint &pos) +KexiBrowser::slotContextMenu(TDEListView* /*list*/, TQListViewItem *item, const TQPoint &pos) { if(!item || !(m_features & ContextMenus)) return; KexiBrowserItem *bit = static_cast<KexiBrowserItem*>(item); - KPopupMenu *pm = 0; + TDEPopupMenu *pm = 0; if (bit->item()) { pm = m_itemPopup; //update popup title @@ -762,7 +762,7 @@ void KexiBrowser::slotNewObjectPopupAboutToShow() KexiPart::PartInfoList *list = Kexi::partManager().partInfoList(); //this list is properly sorted for (KexiPart::PartInfoListIterator it(*list); it.current(); ++it) { //add an item to "New object" toolbar popup - KAction *action = m_mainWin->actionCollection()->action( + TDEAction *action = m_mainWin->actionCollection()->action( TQString(KexiPart::nameForCreateAction(*it.current())).ascii() ); if (action) { action->plug(m_newObjectPopup); @@ -853,7 +853,7 @@ void KexiBrowser::clear() //-------------------------------------------- KexiBrowserListView::KexiBrowserListView(TQWidget *parent) - : KListView(parent, "KexiBrowserListView") + : TDEListView(parent, "KexiBrowserListView") , nameEndsWithAsterisk(false) , enableExecuteArea(true) { @@ -876,14 +876,14 @@ void KexiBrowserListView::rename(TQListViewItem *item, int c) nameEndsWithAsterisk = item->text(0).endsWith("*"); if (nameEndsWithAsterisk) item->setText(0, item->text(0).left(item->text(0).length()-1)); - KListView::rename(item, c); + TDEListView::rename(item, c); adjustColumn(0); } } bool KexiBrowserListView::isExecuteArea( const TQPoint& point ) { - return enableExecuteArea && KListView::isExecuteArea(point); + return enableExecuteArea && TDEListView::isExecuteArea(point); } #include "kexibrowser.moc" diff --git a/kexi/widget/kexibrowser.h b/kexi/widget/kexibrowser.h index 602fffe1..d4c8033f 100644 --- a/kexi/widget/kexibrowser.h +++ b/kexi/widget/kexibrowser.h @@ -27,12 +27,12 @@ class TQListViewItem; class KIconLoader; -class KPopupMenu; -class KAction; -class KActionMenu; -class KActionCollection; -class KListView; -class KToolBar; +class TDEPopupMenu; +class TDEAction; +class TDEActionMenu; +class TDEActionCollection; +class TDEListView; +class TDEToolBar; class KexiBrowserItem; class KexiView; class KexiMainWindow; @@ -129,7 +129,7 @@ class KEXIEXTWIDGETS_EXPORT KexiBrowser : public TQWidget void pageSetupForItem( KexiPart::Item* ); protected slots: - void slotContextMenu(KListView*, TQListViewItem *i, const TQPoint &point); + void slotContextMenu(TDEListView*, TQListViewItem *i, const TQPoint &point); void slotExecuteItem(TQListViewItem *item); void slotSelectionChanged(TQListViewItem* i); void slotSettingsChanged(int); @@ -156,17 +156,17 @@ class KEXIEXTWIDGETS_EXPORT KexiBrowser : public TQWidget KexiMainWindow *m_mainWin; int m_features; KexiBrowserListView *m_list; - KActionCollection *m_actions; + TDEActionCollection *m_actions; TQAsciiDict<KexiBrowserItem> m_baseItems; TQIntDict<KexiBrowserItem> m_normalItems; - KPopupMenu *m_itemPopup, *m_partPopup; - KAction *m_deleteAction, *m_renameAction, + TDEPopupMenu *m_itemPopup, *m_partPopup; + TDEAction *m_deleteAction, *m_renameAction, *m_newObjectAction, // *m_newObjectToolbarAction, *m_openAction, *m_designAction, *m_editTextAction, *m_executeAction, *m_dataExportAction, *m_printAction, *m_pageSetupAction; - KActionMenu* m_exportActionMenu; - KPopupMenu* m_newObjectPopup; + TDEActionMenu* m_exportActionMenu; + TDEPopupMenu* m_newObjectPopup; int m_itemPopupTitle_id, m_partPopupTitle_id, m_openAction_id, m_designAction_id, m_editTextAction_id, m_executeAction_id, @@ -174,7 +174,7 @@ class KEXIEXTWIDGETS_EXPORT KexiBrowser : public TQWidget m_printAction_id, m_pageSetupAction_id, m_pageSetupAction_id_sep; KexiPart::Part *m_prevSelectedPart; - KToolBar *m_toolbar; + TDEToolBar *m_toolbar; KexiSmallToolButton *m_newObjectToolButton, *m_deleteObjectToolButton; TQString m_itemsMimeType; bool m_singleClick : 1; diff --git a/kexi/widget/kexibrowser_p.h b/kexi/widget/kexibrowser_p.h index bcfc9479..bd9eb8f5 100644 --- a/kexi/widget/kexibrowser_p.h +++ b/kexi/widget/kexibrowser_p.h @@ -24,7 +24,7 @@ #include <klistview.h> /*! @internal */ -class KexiBrowserListView : public KListView +class KexiBrowserListView : public TDEListView { Q_OBJECT diff --git a/kexi/widget/kexibrowseritem.cpp b/kexi/widget/kexibrowseritem.cpp index 99b80095..3c61e77a 100644 --- a/kexi/widget/kexibrowseritem.cpp +++ b/kexi/widget/kexibrowseritem.cpp @@ -24,8 +24,8 @@ #include <kiconloader.h> #include <core/kexipartinfo.h> -KexiBrowserItem::KexiBrowserItem(KListView *parent, KexiPart::Info *i) - : KListViewItem(parent, i->groupName()) +KexiBrowserItem::KexiBrowserItem(TDEListView *parent, KexiPart::Info *i) + : TDEListViewItem(parent, i->groupName()) , m_info(i) , m_item(0) { @@ -36,8 +36,8 @@ KexiBrowserItem::KexiBrowserItem(KListView *parent, KexiPart::Info *i) m_fifoSorting = 1; //because this is top level item } -KexiBrowserItem::KexiBrowserItem(KListViewItem *parent, KexiPart::Info *i, KexiPart::Item *item) - : KListViewItem(parent, item->name()) +KexiBrowserItem::KexiBrowserItem(TDEListViewItem *parent, KexiPart::Info *i, KexiPart::Item *item) + : TDEListViewItem(parent, item->name()) , m_info(i) , m_item(item) { @@ -45,8 +45,8 @@ KexiBrowserItem::KexiBrowserItem(KListViewItem *parent, KexiPart::Info *i, KexiP initItem(); } -KexiBrowserItem::KexiBrowserItem(KListView *parent, KexiPart::Info *i, KexiPart::Item *item) - : KListViewItem(parent, item->name()) +KexiBrowserItem::KexiBrowserItem(TDEListView *parent, KexiPart::Info *i, KexiPart::Item *item) + : TDEListViewItem(parent, item->name()) , m_info(i) , m_item(item) { @@ -85,7 +85,7 @@ KexiBrowserItem::clearChildren() TQString KexiBrowserItem::key( int column, bool ascending ) const { -// kdDebug() << "KexiBrowserItem::key() : " << (m_fifoSorting ? m_sortKey : KListViewItem::key(column,ascending)) << endl; - return m_fifoSorting ? m_sortKey : KListViewItem::key(column,ascending); +// kdDebug() << "KexiBrowserItem::key() : " << (m_fifoSorting ? m_sortKey : TDEListViewItem::key(column,ascending)) << endl; + return m_fifoSorting ? m_sortKey : TDEListViewItem::key(column,ascending); } diff --git a/kexi/widget/kexibrowseritem.h b/kexi/widget/kexibrowseritem.h index 9138dafd..4dfa1232 100644 --- a/kexi/widget/kexibrowseritem.h +++ b/kexi/widget/kexibrowseritem.h @@ -33,18 +33,18 @@ namespace KexiPart //! @short List view item for the navigator widget (KexiBrowser) //! Used for creating group items as well as object items -class KEXIEXTWIDGETS_EXPORT KexiBrowserItem : public KListViewItem +class KEXIEXTWIDGETS_EXPORT KexiBrowserItem : public TDEListViewItem { public: //! Creates group item for part \a i - KexiBrowserItem(KListView *parent, KexiPart::Info *i); + KexiBrowserItem(TDEListView *parent, KexiPart::Info *i); //! Creates item for object \a item defined by part \a i for \a parent - KexiBrowserItem(KListViewItem *parent, KexiPart::Info *i, KexiPart::Item *item); + KexiBrowserItem(TDEListViewItem *parent, KexiPart::Info *i, KexiPart::Item *item); //! Creates item for object \a item defined by part \a i, without parent //! (used in a case when KexiBrowser::itemsMimeType() is not empty) - KexiBrowserItem(KListView *parent, KexiPart::Info *i, KexiPart::Item *item); + KexiBrowserItem(TDEListView *parent, KexiPart::Info *i, KexiPart::Item *item); virtual ~KexiBrowserItem(); diff --git a/kexi/widget/kexidataawareview.cpp b/kexi/widget/kexidataawareview.cpp index 29bd06d0..6dc75abb 100644 --- a/kexi/widget/kexidataawareview.cpp +++ b/kexi/widget/kexidataawareview.cpp @@ -188,7 +188,7 @@ void KexiDataAwareView::reloadActions() //warning FIXME Move this to the table part /* kdDebug()<<"INIT ACTIONS***********************************************************************"<<endl; - new KAction(i18n("Filter"), "filter", 0, TQT_TQOBJECT(this), TQT_SLOT(filter()), actionCollection(), "tablepart_filter"); + new TDEAction(i18n("Filter"), "filter", 0, TQT_TQOBJECT(this), TQT_SLOT(filter()), actionCollection(), "tablepart_filter"); setXMLFile("kexidatatableui.rc"); */ m_dataAwareObject->contextMenu()->clear(); diff --git a/kexi/widget/kexidatatable.h b/kexi/widget/kexidatatable.h index b82e4f62..68f9caf0 100644 --- a/kexi/widget/kexidatatable.h +++ b/kexi/widget/kexidatatable.h @@ -28,7 +28,7 @@ class KexiMainWindow; class KexiDataTableView; class KexiTableView; class KexiTableViewData; -class KPopupMenu; +class TDEPopupMenu; namespace KexiDB { diff --git a/kexi/widget/kexifieldlistview.cpp b/kexi/widget/kexifieldlistview.cpp index 07a3f4ab..fe81b9eb 100644 --- a/kexi/widget/kexifieldlistview.cpp +++ b/kexi/widget/kexifieldlistview.cpp @@ -43,7 +43,7 @@ #include <kexiutils/utils.h> KexiFieldListView::KexiFieldListView(TQWidget *parent, const char *name, int options) - : KListView(parent, name) + : TDEListView(parent, name) , m_schema(0) , m_keyIcon(SmallIcon("key")) , m_noIcon(KexiUtils::emptyIcon(KIcon::Small)) @@ -87,7 +87,7 @@ void KexiFieldListView::setSchema(KexiDB::TableOrQuerySchema* schema) int order=0; bool hasPKeys = true; //t->hasPrimaryKeys(); - KListViewItem *item = 0; + TDEListViewItem *item = 0; KexiDB::QueryColumnInfo::Vector columns = m_schema->columns(true /*unique*/); const int count = columns.count(); for(int i=-1; i < count; i++) @@ -96,12 +96,12 @@ void KexiFieldListView::setSchema(KexiDB::TableOrQuerySchema* schema) if (i==-1) { if (! (m_options & ShowAsterisk)) continue; - item = new KListViewItem(this, item, i18n("* (All Columns)")); + item = new TDEListViewItem(this, item, i18n("* (All Columns)")); m_allColumnsItem = item; } else { colinfo = columns[i]; - item = new KListViewItem(this, item, colinfo->aliasOrName()); + item = new TDEListViewItem(this, item, colinfo->aliasOrName()); if (m_options & ShowDataTypes) item->setText(1, colinfo->field->typeName()); } diff --git a/kexi/widget/kexifieldlistview.h b/kexi/widget/kexifieldlistview.h index a5630a30..e936cc89 100644 --- a/kexi/widget/kexifieldlistview.h +++ b/kexi/widget/kexifieldlistview.h @@ -24,7 +24,7 @@ #include <tqpixmap.h> #include <klistview.h> -class KListViewItem; +class TDEListViewItem; namespace KexiDB { class TableOrQuerySchema; @@ -32,7 +32,7 @@ namespace KexiDB { /*! This widget provides a list of fields from a table or query. */ -class KEXIEXTWIDGETS_EXPORT KexiFieldListView : public KListView +class KEXIEXTWIDGETS_EXPORT KexiFieldListView : public TDEListView { Q_OBJECT @@ -77,7 +77,7 @@ class KEXIEXTWIDGETS_EXPORT KexiFieldListView : public KListView TQPixmap m_keyIcon; //!< a small "primary key" icon for 0-th column TQPixmap m_noIcon; //!< blank icon of the same size as m_keyIcon int m_options; - KListViewItem *m_allColumnsItem; + TDEListViewItem *m_allColumnsItem; }; #endif diff --git a/kexi/widget/kexismalltoolbutton.cpp b/kexi/widget/kexismalltoolbutton.cpp index 82b6489e..8852f81c 100644 --- a/kexi/widget/kexismalltoolbutton.cpp +++ b/kexi/widget/kexismalltoolbutton.cpp @@ -44,7 +44,7 @@ KexiSmallToolButton::KexiSmallToolButton(TQWidget* parent, const TQString& text, update(text, iconSet); } -KexiSmallToolButton::KexiSmallToolButton(TQWidget* parent, KAction* action) +KexiSmallToolButton::KexiSmallToolButton(TQWidget* parent, TDEAction* action) : TQToolButton(parent, action->name()) , m_action(action) { diff --git a/kexi/widget/kexismalltoolbutton.h b/kexi/widget/kexismalltoolbutton.h index 3f8dd615..13aad9e8 100644 --- a/kexi/widget/kexismalltoolbutton.h +++ b/kexi/widget/kexismalltoolbutton.h @@ -38,7 +38,7 @@ class KEXIEXTWIDGETS_EXPORT KexiSmallToolButton : public TQToolButton KexiSmallToolButton(TQWidget* parent, const TQString& text, const TQIconSet& iconSet, const char* name = 0); - KexiSmallToolButton(TQWidget* parent, KAction *action); + KexiSmallToolButton(TQWidget* parent, TDEAction *action); virtual ~KexiSmallToolButton(); @@ -54,7 +54,7 @@ class KEXIEXTWIDGETS_EXPORT KexiSmallToolButton : public TQToolButton void init(); virtual void drawButton( TQPainter *_painter ); - TQGuardedPtr<KAction> m_action; + TQGuardedPtr<TDEAction> m_action; }; #endif diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp index f3224c7e..d7e2dae1 100644 --- a/kexi/widget/pixmapcollection.cpp +++ b/kexi/widget/pixmapcollection.cpp @@ -365,7 +365,7 @@ void PixmapCollectionEditor::displayMenu(TQIconViewItem *it, const TQPoint &p) { if(!it) return; - KPopupMenu *menu = new KPopupMenu(); + TDEPopupMenu *menu = new TDEPopupMenu(); menu->insertItem(SmallIconSet("edit"), i18n("Rename Item"), this, TQT_SLOT(renameItem())); menu->insertItem(SmallIconSet("remove"), i18n("Remove Item"), this, TQT_SLOT(removeItem())); menu->exec(p); diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp index a3ce7632..d901d373 100644 --- a/kexi/widget/relations/kexirelationview.cpp +++ b/kexi/widget/relations/kexirelationview.cpp @@ -62,22 +62,22 @@ KexiRelationView::KexiRelationView(TQWidget *parent, const char *name) setResizePolicy(Manual); /*MOVED TO KexiRelationDialog //actions - m_tableQueryPopup = new KPopupMenu(this, "m_popup"); + m_tableQueryPopup = new TDEPopupMenu(this, "m_popup"); m_tableQueryPopup->insertTitle(i18n("Table")); - m_connectionPopup = new KPopupMenu(this, "m_connectionPopup"); + m_connectionPopup = new TDEPopupMenu(this, "m_connectionPopup"); m_connectionPopup->insertTitle(i18n("Relation")); - m_areaPopup = new KPopupMenu(this, "m_areaPopup"); + m_areaPopup = new TDEPopupMenu(this, "m_areaPopup"); plugSharedAction("edit_delete", i18n("Hide Table"), m_tableQueryPopup); plugSharedAction("edit_delete",m_connectionPopup); plugSharedAction("edit_delete",this, TQT_SLOT(removeSelectedObject())); */ #if 0 - m_removeSelectedTableQueryAction = new KAction(i18n("&Hide Selected Table/Query"), "editdelete", "", + m_removeSelectedTableQueryAction = new TDEAction(i18n("&Hide Selected Table/Query"), "editdelete", "", this, TQT_SLOT(removeSelectedTableQuery()), parent->actionCollection(), "relationsview_removeSelectedTableQuery"); - m_removeSelectedConnectionAction = new KAction(i18n("&Remove Selected Relationship"), "button_cancel", "", + m_removeSelectedConnectionAction = new TDEAction(i18n("&Remove Selected Relationship"), "button_cancel", "", this, TQT_SLOT(removeSelectedConnection()), parent->actionCollection(), "relationsview_removeSelectedConnection"); - m_openSelectedTableQueryAction = new KAction(i18n("&Open Selected Table/Query"), "", "", + m_openSelectedTableQueryAction = new TDEAction(i18n("&Open Selected Table/Query"), "", "", this, TQT_SLOT(openSelectedTableQuery()), 0/*parent->actionCollection()*/, "relationsview_openSelectedTableQuery"); #endif @@ -86,7 +86,7 @@ KexiRelationView::KexiRelationView(TQWidget *parent, const char *name) #if 0 - m_popup = new KPopupMenu(this, "m_popup"); + m_popup = new TDEPopupMenu(this, "m_popup"); m_openSelectedTableQueryAction->plug( m_popup ); m_removeSelectedTableQueryAction->plug( m_popup ); m_removeSelectedConnectionAction->plug( m_popup ); diff --git a/kexi/widget/relations/kexirelationview.h b/kexi/widget/relations/kexirelationview.h index 9fa741f6..e801b801 100644 --- a/kexi/widget/relations/kexirelationview.h +++ b/kexi/widget/relations/kexirelationview.h @@ -34,8 +34,8 @@ class TQFrame; class KexiRelationViewTable; class KexiRelationViewTableContainer; -class KAction; -class KPopupMenu; +class TDEAction; +class TDEPopupMenu; namespace KexiDB { diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp index a3ad0d5d..cba19483 100644 --- a/kexi/widget/relations/kexirelationviewtable.cpp +++ b/kexi/widget/relations/kexirelationviewtable.cpp @@ -75,8 +75,8 @@ KexiRelationViewTableContainer::KexiRelationViewTableContainer( // m_tableView->resize( m_tableView->sizeHint() ); lyr->addWidget(m_tableView, 0); connect(m_tableView, TQT_SIGNAL(tableScrolling()), this, TQT_SLOT(moved())); - connect(m_tableView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&))); + connect(m_tableView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&))); } KexiRelationViewTableContainer::~KexiRelationViewTableContainer() @@ -88,7 +88,7 @@ KexiDB::TableOrQuerySchema* KexiRelationViewTableContainer::schema() const return m_tableView->schema(); } -void KexiRelationViewTableContainer::slotContextMenu(KListView *, TQListViewItem *, const TQPoint &p) +void KexiRelationViewTableContainer::slotContextMenu(TDEListView *, TQListViewItem *, const TQPoint &p) { // m_parent->executePopup(p); emit contextMenuRequest( p ); @@ -412,7 +412,7 @@ void KexiRelationViewTable::contentsMousePressEvent(TQMouseEvent *ev) { parentWidget()->setFocus(); setFocus(); - KListView::contentsMousePressEvent(ev); + TDEListView::contentsMousePressEvent(ev); // if (ev->button()==Qt::RightButton) // static_cast<KexiRelationView*>(parentWidget())->executePopup(ev->pos()); } diff --git a/kexi/widget/relations/kexirelationviewtable.h b/kexi/widget/relations/kexirelationviewtable.h index 176cc2b8..5e3ff332 100644 --- a/kexi/widget/relations/kexirelationviewtable.h +++ b/kexi/widget/relations/kexirelationviewtable.h @@ -70,7 +70,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableContainer : public TQFrame protected slots: void moved(); - void slotContextMenu(KListView *lv, TQListViewItem *i, const TQPoint& p); + void slotContextMenu(TDEListView *lv, TQListViewItem *i, const TQPoint& p); protected: // KexiDB::TableSchema *m_table; @@ -82,7 +82,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableContainer : public TQFrame }; /* -class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableItem : public KListViewItem +class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableItem : public TDEListViewItem { public: KexiRelationViewTableItem(TQListView *parent, TQListViewItem *after, diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp index 4c5754b5..47075bbb 100644 --- a/kexi/widget/relations/kexirelationwidget.cpp +++ b/kexi/widget/relations/kexirelationwidget.cpp @@ -73,25 +73,25 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *parent, //m_relationView->setFocus(); //actions - m_tableQueryPopup = new KPopupMenu(this, "m_popup"); + m_tableQueryPopup = new TDEPopupMenu(this, "m_popup"); m_tableQueryPopupTitleID = m_tableQueryPopup->insertTitle(SmallIcon("table"), ""); connect(m_tableQueryPopup, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowPopupMenu())); - m_connectionPopup = new KPopupMenu(this, "m_connectionPopup"); + m_connectionPopup = new TDEPopupMenu(this, "m_connectionPopup"); m_connectionPopupTitleID = m_connectionPopup->insertTitle(""); connect(m_connectionPopup, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowPopupMenu())); - m_areaPopup = new KPopupMenu(this, "m_areaPopup"); + m_areaPopup = new TDEPopupMenu(this, "m_areaPopup"); - m_openSelectedTableAction = new KAction(i18n("&Open Table"), SmallIcon("fileopen"), KShortcut(), + m_openSelectedTableAction = new TDEAction(i18n("&Open Table"), SmallIcon("fileopen"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(openSelectedTable()), TQT_TQOBJECT(this), "relationsview_openTable"); m_openSelectedTableAction->plug( m_tableQueryPopup ); - m_designSelectedTableAction = new KAction(i18n("&Design Table"), SmallIcon("edit"), KShortcut(), + m_designSelectedTableAction = new TDEAction(i18n("&Design Table"), SmallIcon("edit"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(designSelectedTable()), TQT_TQOBJECT(this), "relationsview_designTable"); m_designSelectedTableAction->plug( m_tableQueryPopup ); m_tableQueryPopup->insertSeparator(); - KAction* hide_action = plugSharedAction("edit_delete", i18n("&Hide Table"), m_tableQueryPopup); + TDEAction* hide_action = plugSharedAction("edit_delete", i18n("&Hide Table"), m_tableQueryPopup); hide_action->setIconSet(TQIconSet()); plugSharedAction("edit_delete",m_connectionPopup); diff --git a/kexi/widget/relations/kexirelationwidget.h b/kexi/widget/relations/kexirelationwidget.h index 2d6d2064..c71b6e18 100644 --- a/kexi/widget/relations/kexirelationwidget.h +++ b/kexi/widget/relations/kexirelationwidget.h @@ -28,8 +28,8 @@ class KComboBox; class KPushButton; -class KPopupMenu; -class KAction; +class TDEPopupMenu; +class TDEAction; class TQListViewItem; class KexiMainWindow; @@ -127,10 +127,10 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationWidget : public KexiViewBase KexiRelationView *m_relationView; KexiDB::Connection *m_conn; - KPopupMenu *m_tableQueryPopup //over table/query + TDEPopupMenu *m_tableQueryPopup //over table/query , *m_connectionPopup //over connection , *m_areaPopup; //over outer area - KAction *m_openSelectedTableAction, *m_designSelectedTableAction; + TDEAction *m_openSelectedTableAction, *m_designSelectedTableAction; int m_tableQueryPopupTitleID, m_connectionPopupTitleID; }; diff --git a/kexi/widget/tableview/kexidataawareobjectiface.h b/kexi/widget/tableview/kexidataawareobjectiface.h index 0fed82b6..5d87ad88 100644 --- a/kexi/widget/tableview/kexidataawareobjectiface.h +++ b/kexi/widget/tableview/kexidataawareobjectiface.h @@ -36,7 +36,7 @@ class TQObject; class TQScrollBar; -class KPopupMenu; +class TDEPopupMenu; class KexiTableItem; class KexiTableViewData; class KexiRecordMarker; @@ -419,7 +419,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface virtual void dataSet( KexiTableViewData *data ) = 0; /*! \return a pointer to context menu. This can be used to plug some actions there. */ - KPopupMenu* contextMenu() const { return m_popupMenu; } + TDEPopupMenu* contextMenu() const { return m_popupMenu; } /*! \return true if the context menu is enabled (visible) for the view. True by default. */ @@ -818,7 +818,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface int m_dragIndicatorLine; /*! Context menu widget. */ - KPopupMenu *m_popupMenu; + TDEPopupMenu *m_popupMenu; bool m_contextMenuEnabled : 1; diff --git a/kexi/widget/tableview/kexidatatableview.cpp b/kexi/widget/tableview/kexidatatableview.cpp index a132e829..e4a6288e 100644 --- a/kexi/widget/tableview/kexidatatableview.cpp +++ b/kexi/widget/tableview/kexidatatableview.cpp @@ -63,10 +63,10 @@ KexiDataTableView::init() // connect(verticalScrollBar(), TQT_SIGNAL(sliderMoved(int)), this, TQT_SLOT(slotMoving(int))); } -/*void KexiDataTableView::initActions(KActionCollection *col) +/*void KexiDataTableView::initActions(TDEActionCollection *col) { KexiTableView::initActions(col); - new KAction(i18n("Filter"), "filter", 0, this, TQT_SLOT(filter()), col, "tablepart_filter"); + new TDEAction(i18n("Filter"), "filter", 0, this, TQT_SLOT(filter()), col, "tablepart_filter"); }*/ bool KexiDataTableView::setData(KexiDB::Cursor *cursor) diff --git a/kexi/widget/tableview/kexidatatableview.h b/kexi/widget/tableview/kexidatatableview.h index 8592e1b8..120c9817 100644 --- a/kexi/widget/tableview/kexidatatableview.h +++ b/kexi/widget/tableview/kexidatatableview.h @@ -56,7 +56,7 @@ class KEXIDATATABLE_EXPORT KexiDataTableView : public KexiTableView ~KexiDataTableView(); -// virtual void initActions(KActionCollection *col); +// virtual void initActions(TDEActionCollection *col); /*! Fills table view with data using \a cursor. \return true on success. Cursor \a cursor will not be owned by this object. */ diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp index 4303e551..b975fcdf 100644 --- a/kexi/widget/tableview/kexitableview.cpp +++ b/kexi/widget/tableview/kexitableview.cpp @@ -217,7 +217,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch verticalScrollBar()->raise(); //context menu - m_popupMenu = new KPopupMenu(this, "contextMenu"); + m_popupMenu = new TDEPopupMenu(this, "contextMenu"); #if 0 //moved to mainwindow's actions d->menu_id_addRecord = m_popupMenu->insertItem(i18n("Add Record"), this, TQT_SLOT(addRecord()), TQt::CTRL+TQt::Key_Insert); d->menu_id_removeRecord = m_popupMenu->insertItem( @@ -322,7 +322,7 @@ void KexiTableView::clearVariables() d->clearVariables(); } -/*void KexiTableView::initActions(KActionCollection *ac) +/*void KexiTableView::initActions(TDEActionCollection *ac) { emit reloadActions(ac); }*/ @@ -1224,11 +1224,11 @@ static bool overrideEditorShortcutNeeded(TQKeyEvent *e) bool KexiTableView::shortCutPressed( TQKeyEvent *e, const TQCString &action_name ) { const int k = e->key(); - KAction *action = m_sharedActions[action_name]; + TDEAction *action = m_sharedActions[action_name]; if (action) { if (!action->isEnabled())//this action is disabled - don't process it! return false; - if (action->shortcut() == KShortcut( KKey(e) )) { + if (action->shortcut() == TDEShortcut( KKey(e) )) { //special cases when we need to override editor's shortcut if (overrideEditorShortcutNeeded(e)) { return true; diff --git a/kexi/widget/tableview/kexitableview.h b/kexi/widget/tableview/kexitableview.h index f4364eb8..2e1d83fd 100644 --- a/kexi/widget/tableview/kexitableview.h +++ b/kexi/widget/tableview/kexitableview.h @@ -42,16 +42,16 @@ #include <widget/utils/kexisharedactionclient.h> #include "kexidataawareobjectiface.h" -class KPopupMenu; +class TDEPopupMenu; class KPrinter; -class KAction; +class TDEAction; class KexiTableHeader; class KexiTableItem; class KexiTableView; class KexiTableEdit; class KexiTableViewPrivate; -class KActionCollection; +class TDEActionCollection; namespace KexiDB { class RowEditBuffer; diff --git a/kexi/widget/utils/kexicontextmenuutils.cpp b/kexi/widget/utils/kexicontextmenuutils.cpp index 30ecab17..eb735a49 100644 --- a/kexi/widget/utils/kexicontextmenuutils.cpp +++ b/kexi/widget/utils/kexicontextmenuutils.cpp @@ -44,8 +44,8 @@ public: { } - KActionCollection actionCollection; - KAction *insertFromFileAction, *saveAsAction, *cutAction, *copyAction, *pasteAction, + TDEActionCollection actionCollection; + TDEAction *insertFromFileAction, *saveAsAction, *cutAction, *copyAction, *pasteAction, *deleteAction #ifdef KEXI_NO_UNFINISHED , *propertiesAction @@ -56,13 +56,13 @@ public: //------------ KexiImageContextMenu::KexiImageContextMenu(TQWidget* parent) - : KPopupMenu(parent) + : TDEPopupMenu(parent) , d( new Private(this) ) { setName("KexiImageContextMenu"); insertTitle(TQString()); - d->insertFromFileAction = new KAction(i18n("Insert From &File..."), SmallIconSet("fileopen"), 0, + d->insertFromFileAction = new TDEAction(i18n("Insert From &File..."), SmallIconSet("fileopen"), 0, TQT_TQOBJECT(this), TQT_SLOT(insertFromFile()), &d->actionCollection, "insert"); d->insertFromFileAction->plug(this); d->saveAsAction = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), &d->actionCollection); @@ -75,14 +75,14 @@ KexiImageContextMenu::KexiImageContextMenu(TQWidget* parent) d->copyAction->plug(this); d->pasteAction = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(paste()), &d->actionCollection); d->pasteAction->plug(this); - d->deleteAction = new KAction(i18n("&Clear"), SmallIconSet("editdelete"), 0, + d->deleteAction = new TDEAction(i18n("&Clear"), SmallIconSet("editdelete"), 0, TQT_TQOBJECT(this), TQT_SLOT(clear()), &d->actionCollection, "delete"); d->deleteAction->plug(this); #ifdef KEXI_NO_UNFINISHED d->propertiesAction = 0; #else insertSeparator(); - d->propertiesAction = new KAction(i18n("Properties"), 0, 0, + d->propertiesAction = new TDEAction(i18n("Properties"), 0, 0, this, TQT_SLOT(showProperties()), &d->actionCollection, "properties"); d->propertiesAction->plug(this); #endif @@ -128,7 +128,7 @@ void KexiImageContextMenu::insertFromFile() //save last visited path // KURL url(fileName); if (url.isLocalFile()) - KRecentDirs::add(":LastVisitedImagePath", url.directory()); + TDERecentDirs::add(":LastVisitedImagePath", url.directory()); #endif emit insertFromFileRequested(url); @@ -164,7 +164,7 @@ void KexiImageContextMenu::saveAs() convertKFileDialogFilterToTQFileDialogFilter(KImageIO::pattern(KImageIO::Writing)), this, 0, i18n("Save Image to File")); #else - //! @todo add originalFileName! (requires access to KRecentDirs) + //! @todo add originalFileName! (requires access to TDERecentDirs) TQString fileName = KFileDialog::getSaveFileName( ":LastVisitedImagePath", KImageIO::pattern(KImageIO::Writing), this, i18n("Save Image to File")); #endif @@ -180,7 +180,7 @@ void KexiImageContextMenu::saveAs() #ifdef TQ_WS_WIN //save last visited path if (url.isLocalFile()) - KRecentDirs::add(":LastVisitedImagePath", url.directory()); + TDERecentDirs::add(":LastVisitedImagePath", url.directory()); #endif TQFile f(fileName); @@ -238,7 +238,7 @@ void KexiImageContextMenu::updateActionsAvailability() d->propertiesAction->setEnabled( !valueIsNull ); } -KActionCollection* KexiImageContextMenu::actionCollection() const +TDEActionCollection* KexiImageContextMenu::actionCollection() const { return &d->actionCollection; } @@ -261,7 +261,7 @@ bool KexiContextMenuUtils::updateTitle(TQPopupMenu *menu, const TQString& object TQMenuItem *item = menu->findItem(id); if (!item) return false; - KPopupTitle *title = dynamic_cast<KPopupTitle *>(item->widget()); + TDEPopupTitle *title = dynamic_cast<TDEPopupTitle *>(item->widget()); if (!title) return false; diff --git a/kexi/widget/utils/kexicontextmenuutils.h b/kexi/widget/utils/kexicontextmenuutils.h index b9f950bf..826b1ebb 100644 --- a/kexi/widget/utils/kexicontextmenuutils.h +++ b/kexi/widget/utils/kexicontextmenuutils.h @@ -24,7 +24,7 @@ #include <kpopupmenu.h> #include <kurl.h> -class KActionCollection; +class TDEActionCollection; class KexiDataItemInterface; //! @short A set of helpers for updating popup menu titles @@ -47,7 +47,7 @@ class KEXIGUIUTILS_EXPORT KexiContextMenuUtils handlers in KexiDBImageBox and KexiBlobTableEdit so these objects can respond on requests for data handling. */ -class KEXIGUIUTILS_EXPORT KexiImageContextMenu : public KPopupMenu +class KEXIGUIUTILS_EXPORT KexiImageContextMenu : public TDEPopupMenu { Q_OBJECT @@ -56,7 +56,7 @@ class KEXIGUIUTILS_EXPORT KexiImageContextMenu : public KPopupMenu KexiImageContextMenu(TQWidget *parent); virtual ~KexiImageContextMenu(); - KActionCollection* actionCollection() const; + TDEActionCollection* actionCollection() const; /*! Updates title for context menu. Used in KexiDBWidgetContextMenuExtender::createTitle(TQPopupMenu *menu) and KexiDBImageBox. diff --git a/kexi/widget/utils/kexisharedactionclient.cpp b/kexi/widget/utils/kexisharedactionclient.cpp index 7436b9f5..ec7d0630 100644 --- a/kexi/widget/utils/kexisharedactionclient.cpp +++ b/kexi/widget/utils/kexisharedactionclient.cpp @@ -30,7 +30,7 @@ KexiSharedActionClient::~KexiSharedActionClient() { } -void KexiSharedActionClient::plugSharedAction(KAction* a) +void KexiSharedActionClient::plugSharedAction(TDEAction* a) { if (!a) return; diff --git a/kexi/widget/utils/kexisharedactionclient.h b/kexi/widget/utils/kexisharedactionclient.h index 58b3bd6a..18b4af11 100644 --- a/kexi/widget/utils/kexisharedactionclient.h +++ b/kexi/widget/utils/kexisharedactionclient.h @@ -22,7 +22,7 @@ #include <tqasciidict.h> -class KAction; +class TDEAction; #include <kexi_export.h> //! The KexiSharedActionClient is an interface using application-wide (shared) actions. @@ -39,11 +39,11 @@ class KEXIGUIUTILS_EXPORT KexiSharedActionClient performed at main window's level, so we should give up. Otherwise - default shortcut will be used (example: Shift+Enter key for "data_save_row" action). \sa KexiTableView::shortCutPressed() */ - void plugSharedAction(KAction* a); + void plugSharedAction(TDEAction* a); protected: //! Actions pluged for this widget using plugSharedAction(), available by name. - TQAsciiDict<KAction> m_sharedActions; + TQAsciiDict<TDEAction> m_sharedActions; }; #endif diff --git a/kexi/widget/utils/klistviewitemtemplate.h b/kexi/widget/utils/klistviewitemtemplate.h index 45a5b889..9a4a3be4 100644 --- a/kexi/widget/utils/klistviewitemtemplate.h +++ b/kexi/widget/utils/klistviewitemtemplate.h @@ -24,25 +24,25 @@ //! TQListViewItem class with ability for storing additional data member template<class type> -class KListViewItemTemplate : public KListViewItem +class TDEListViewItemTemplate : public TDEListViewItem { public: - KListViewItemTemplate(type _data, TQListView *parent) - : KListViewItem(parent), data(_data) {} - KListViewItemTemplate(type _data, TQListViewItem *parent) - : KListViewItem(parent), data(_data) {} - KListViewItemTemplate(type _data, TQListView *parent, TQListViewItem *after) - : KListViewItem(parent, after), data(_data) {} - KListViewItemTemplate(type _data, TQListViewItem *parent, TQListViewItem *after) - : KListViewItem(parent, after), data(_data) {} - KListViewItemTemplate(type _data, TQListView *parent, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString()) - : KListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {} - KListViewItemTemplate(type _data, TQListViewItem *parent, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString()) - : KListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {} - KListViewItemTemplate(type _data, TQListView *parent, TQListViewItem *after, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString()) - : KListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {} - KListViewItemTemplate(type _data, TQListViewItem *parent, TQListViewItem *after, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString()) - : KListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {} + TDEListViewItemTemplate(type _data, TQListView *parent) + : TDEListViewItem(parent), data(_data) {} + TDEListViewItemTemplate(type _data, TQListViewItem *parent) + : TDEListViewItem(parent), data(_data) {} + TDEListViewItemTemplate(type _data, TQListView *parent, TQListViewItem *after) + : TDEListViewItem(parent, after), data(_data) {} + TDEListViewItemTemplate(type _data, TQListViewItem *parent, TQListViewItem *after) + : TDEListViewItem(parent, after), data(_data) {} + TDEListViewItemTemplate(type _data, TQListView *parent, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString()) + : TDEListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {} + TDEListViewItemTemplate(type _data, TQListViewItem *parent, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString()) + : TDEListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {} + TDEListViewItemTemplate(type _data, TQListView *parent, TQListViewItem *after, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString()) + : TDEListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {} + TDEListViewItemTemplate(type _data, TQListViewItem *parent, TQListViewItem *after, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString()) + : TDEListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {} type data; }; |