From dc6b8e72fed2586239e3514819238c520636c9d9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:54:04 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1157656 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- quanta/utility/newstuff.cpp | 22 ++-- quanta/utility/newstuff.h | 12 +- quanta/utility/qpevents.cpp | 64 +++++----- quanta/utility/qpevents.h | 32 ++--- quanta/utility/quantabookmarks.cpp | 58 ++++----- quanta/utility/quantabookmarks.h | 16 +-- quanta/utility/quantacommon.cpp | 212 ++++++++++++++++---------------- quanta/utility/quantacommon.h | 102 ++++++++-------- quanta/utility/quantanetaccess.cpp | 40 +++---- quanta/utility/quantanetaccess.h | 28 ++--- quanta/utility/resource.h | 18 +-- quanta/utility/tagaction.cpp | 232 ++++++++++++++++++------------------ quanta/utility/tagaction.h | 40 +++---- quanta/utility/tagactionmanager.cpp | 8 +- quanta/utility/tagactionmanager.h | 10 +- quanta/utility/tagactionset.cpp | 74 ++++++------ quanta/utility/tagactionset.h | 36 +++--- quanta/utility/toolbartabwidget.cpp | 154 ++++++++++++------------ quanta/utility/toolbartabwidget.h | 50 ++++---- quanta/utility/toolbarxmlgui.cpp | 2 +- quanta/utility/toolbarxmlgui.h | 2 +- 21 files changed, 606 insertions(+), 606 deletions(-) (limited to 'quanta/utility') diff --git a/quanta/utility/newstuff.cpp b/quanta/utility/newstuff.cpp index f6cbf397..bc3a052f 100644 --- a/quanta/utility/newstuff.cpp +++ b/quanta/utility/newstuff.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ //qt includes -#include +#include //kde includes #include @@ -36,8 +36,8 @@ void QNewDTEPStuff::installResource() if (tar.open(IO_ReadOnly)) { const KArchiveDirectory *directory = tar.directory(); - QString dtepDir =KGlobal::dirs()->saveLocation("data") + resourceDir + "dtep/"; - QString dtdName = (*directory->entries().at(0)); + TQString dtepDir =KGlobal::dirs()->saveLocation("data") + resourceDir + "dtep/"; + TQString dtdName = (*directory->entries().at(0)); if (dtdName.isEmpty()) { ok = false; @@ -53,16 +53,16 @@ void QNewDTEPStuff::installResource() KMessageBox::error(parentWidget(), i18n("There was an error with the downloaded DTEP tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("DTEP Installation Error")); } -QNewToolbarStuff::QNewToolbarStuff(const QString &type, QWidget *parentWidget) +QNewToolbarStuff::QNewToolbarStuff(const TQString &type, TQWidget *parentWidget) :KNewStuffSecure(type, parentWidget) { - connect(this, SIGNAL(loadToolbarFile(const KURL&)), parentWidget, SLOT(slotLoadToolbarFile(const KURL&))); + connect(this, TQT_SIGNAL(loadToolbarFile(const KURL&)), parentWidget, TQT_SLOT(slotLoadToolbarFile(const KURL&))); } void QNewToolbarStuff::installResource() { - KURL destURL = KURL::fromPathOrURL(KGlobal::dirs()->saveLocation("data") + resourceDir + "toolbars/" + QFileInfo(m_tarName).fileName()); + KURL destURL = KURL::fromPathOrURL(KGlobal::dirs()->saveLocation("data") + resourceDir + "toolbars/" + TQFileInfo(m_tarName).fileName()); bool ok = true; if (QuantaCommon::checkOverwrite(destURL, parentWidget())) { @@ -80,16 +80,16 @@ void QNewToolbarStuff::installResource() } } -QNewTemplateStuff::QNewTemplateStuff(const QString &type, QWidget *parentWidget) +QNewTemplateStuff::QNewTemplateStuff(const TQString &type, TQWidget *parentWidget) :KNewStuffSecure(type, parentWidget) { - connect(this, SIGNAL(openFile(const KURL&)), parentWidget, SLOT(slotFileOpen(const KURL&))); + connect(this, TQT_SIGNAL(openFile(const KURL&)), parentWidget, TQT_SLOT(slotFileOpen(const KURL&))); } void QNewTemplateStuff::installResource() { - KURL destURL = KURL::fromPathOrURL(KGlobal::dirs()->saveLocation("data") + resourceDir + "templates/" + QFileInfo(m_tarName).fileName()); + KURL destURL = KURL::fromPathOrURL(KGlobal::dirs()->saveLocation("data") + resourceDir + "templates/" + TQFileInfo(m_tarName).fileName()); bool ok = true; if (QuantaCommon::checkOverwrite(destURL, parentWidget())) { @@ -114,7 +114,7 @@ void QNewScriptStuff::installResource() if (tar.open(IO_ReadOnly)) { const KArchiveDirectory *directory = tar.directory(); - QString scriptsDir =KGlobal::dirs()->saveLocation("data") + resourceDir + "scripts/"; + TQString scriptsDir =KGlobal::dirs()->saveLocation("data") + resourceDir + "scripts/"; directory->copyTo(scriptsDir, true); tar.close(); } else @@ -131,7 +131,7 @@ void QNewDocStuff::installResource() if (tar.open(IO_ReadOnly)) { const KArchiveDirectory *directory = tar.directory(); - QString docDir =KGlobal::dirs()->saveLocation("data") + resourceDir + "doc/"; + TQString docDir =KGlobal::dirs()->saveLocation("data") + resourceDir + "doc/"; directory->copyTo(docDir, true); tar.close(); } else diff --git a/quanta/utility/newstuff.h b/quanta/utility/newstuff.h index dd2ad104..bdd49a50 100644 --- a/quanta/utility/newstuff.h +++ b/quanta/utility/newstuff.h @@ -17,7 +17,7 @@ #define NEWSTUFF_H //qt includes -#include +#include //kde includes #include @@ -34,7 +34,7 @@ class QNewDTEPStuff: public KNewStuffSecure Q_OBJECT public: - QNewDTEPStuff(const QString &type, QWidget *parentWidget=0) + QNewDTEPStuff(const TQString &type, TQWidget *parentWidget=0) :KNewStuffSecure(type, parentWidget){}; ~QNewDTEPStuff() {}; @@ -52,7 +52,7 @@ class QNewToolbarStuff: public KNewStuffSecure Q_OBJECT public: - QNewToolbarStuff(const QString &type, QWidget *parentWidget=0); + QNewToolbarStuff(const TQString &type, TQWidget *parentWidget=0); ~QNewToolbarStuff() {}; signals: @@ -72,7 +72,7 @@ class QNewTemplateStuff: public KNewStuffSecure Q_OBJECT public: - QNewTemplateStuff(const QString &type, QWidget *parentWidget=0); + QNewTemplateStuff(const TQString &type, TQWidget *parentWidget=0); ~QNewTemplateStuff() {}; signals: @@ -92,7 +92,7 @@ class QNewScriptStuff: public KNewStuffSecure Q_OBJECT public: - QNewScriptStuff(const QString &type, QWidget *parentWidget=0) + QNewScriptStuff(const TQString &type, TQWidget *parentWidget=0) :KNewStuffSecure(type, parentWidget){}; ~QNewScriptStuff() {}; @@ -110,7 +110,7 @@ class QNewDocStuff: public KNewStuffSecure Q_OBJECT public: - QNewDocStuff(const QString &type, QWidget *parentWidget=0) + QNewDocStuff(const TQString &type, TQWidget *parentWidget=0) :KNewStuffSecure(type, parentWidget){}; ~QNewDocStuff() {}; diff --git a/quanta/utility/qpevents.cpp b/quanta/utility/qpevents.cpp index bb0d5db4..7bad8715 100644 --- a/quanta/utility/qpevents.cpp +++ b/quanta/utility/qpevents.cpp @@ -15,9 +15,9 @@ ***************************************************************************/ //qt includes -#include -#include -#include +#include +#include +#include //kde includes #include @@ -36,8 +36,8 @@ #include "tagaction.h" //TODO: Better create a class for each internal event action -QPEvents::QPEvents(QObject *parent, const char *name) - : QObject(parent, name) +QPEvents::QPEvents(TQObject *parent, const char *name) + : TQObject(parent, name) { m_eventNames["before_save"] = i18n("Before Document Save"); m_eventNames["after_save"] = i18n("After Document Save"); @@ -70,7 +70,7 @@ QPEvents::~QPEvents() { } -void QPEvents::slotEventHappened(const QString& name, const QString& argument1, const QString& argument2) +void QPEvents::slotEventHappened(const TQString& name, const TQString& argument1, const TQString& argument2) { if (!quantaApp || !Project::ref()->eventsEnabled()) return; @@ -79,8 +79,8 @@ void QPEvents::slotEventHappened(const QString& name, const QString& argument1, if (events->contains(name)) { m_eventName = name; - QValueList evList = (*events)[name]; - for (QValueList::Iterator it = evList.begin(); it != evList.end(); ++it) + TQValueList evList = (*events)[name]; + for (TQValueList::Iterator it = evList.begin(); it != evList.end(); ++it) { EventAction ev = *it; if (ev.type == EventAction::Internal) @@ -131,7 +131,7 @@ void QPEvents::slotEventHappened(const QString& name, const QString& argument1, } } else { - QString relativePath = QExtFileInfo::toRelative(url, Project::ref()->projectBaseURL()).path(); + TQString relativePath = QExtFileInfo::toRelative(url, Project::ref()->projectBaseURL()).path(); if (inProject && name == "after_save") { ev.arguments << i18n("Document saved"); @@ -230,16 +230,16 @@ bool QPEvents::handleEvent(const EventAction& ev) { if (ev.action == "email") { - QString receiver = ev.arguments[0]; + TQString receiver = ev.arguments[0]; TeamMember member; if (receiver == "teamleader") member = Project::ref()->teamLeader(); else if (receiver.startsWith("subprojectleader-")) { - QString s = receiver.remove("subprojectleader-"); + TQString s = receiver.remove("subprojectleader-"); member = Project::ref()->subprojectLeader(s); SubProject subProject; - QValueList *subprojects = Project::ref()->subprojects(); + TQValueList *subprojects = Project::ref()->subprojects(); for (uint i = 0 ; i < subprojects->count(); i++) { if ((*subprojects)[i].name == s) @@ -257,16 +257,16 @@ bool QPEvents::handleEvent(const EventAction& ev) else if (receiver.startsWith("taskleader-")) member = Project::ref()->taskLeader(receiver.remove("taskleader-")); - QString body; + TQString body; for (uint i = 2; i < ev.arguments.count(); i++) body += ev.arguments[i] + "\n"; - kapp->invokeMailer(member.name + "<" + member.email + ">", "", "", ev.arguments[1], body, "", QStringList(), ""); + kapp->invokeMailer(member.name + "<" + member.email + ">", "", "", ev.arguments[1], body, "", TQStringList(), ""); return true; } if (ev.action == "log") { - QString logFile = ev.arguments[0]; + TQString logFile = ev.arguments[0]; KURL url = KURL::fromPathOrURL(logFile); if (url.isValid() && !url.isLocalFile()) { @@ -283,7 +283,7 @@ bool QPEvents::handleEvent(const EventAction& ev) return false; } } - QFile file(url.path()); + TQFile file(url.path()); bool result; if (ev.arguments[2] == "create_new") result = file.open(IO_WriteOnly); @@ -291,10 +291,10 @@ bool QPEvents::handleEvent(const EventAction& ev) result = file.open(IO_WriteOnly | IO_Append); if (result) { - QTextStream stream(&file); - stream.setEncoding(QTextStream::UnicodeUTF8); + TQTextStream stream(&file); + stream.setEncoding(TQTextStream::UnicodeUTF8); //Note: the log text should not be translated. - QString s = QDateTime::currentDateTime().toString(Qt::ISODate) + ": "; + TQString s = TQDateTime::currentDateTime().toString(Qt::ISODate) + ": "; s.append( "Event : " + m_eventName + " : "); s.append( "Action: " + ev.action + " : "); if (ev.arguments[1] == "full") @@ -320,7 +320,7 @@ bool QPEvents::handleEvent(const EventAction& ev) //KMessageBox::sorry(0L, i18n("External event actions are not yet supported.")); if (ev.action == "script" || ev.action =="action") { - QString name = ev.arguments[0]; + TQString name = ev.arguments[0]; KAction *action = quantaApp->actionCollection()->action(name); TagAction *tagAction = dynamic_cast(action); if (tagAction) @@ -344,7 +344,7 @@ bool QPEvents::handleEvent(const EventAction& ev) return false; } -QString QPEvents::fullEventName(const QString &name) +TQString QPEvents::fullEventName(const TQString &name) { if (m_eventNames.contains(name)) return m_eventNames[name]; @@ -352,7 +352,7 @@ QString QPEvents::fullEventName(const QString &name) return name; } -QString QPEvents::fullActionName(const QString& name) +TQString QPEvents::fullActionName(const TQString& name) { if (m_actionNames.contains(name)) return m_actionNames[name]; @@ -360,9 +360,9 @@ QString QPEvents::fullActionName(const QString& name) return name; } -QString QPEvents::eventName(const QString &fullName) +TQString QPEvents::eventName(const TQString &fullName) { - for (QMap::ConstIterator it = m_eventNames.constBegin(); it != m_eventNames.constEnd(); ++it) + for (TQMap::ConstIterator it = m_eventNames.constBegin(); it != m_eventNames.constEnd(); ++it) { if (fullName == it.data()) return it.key(); @@ -370,9 +370,9 @@ QString QPEvents::eventName(const QString &fullName) return fullName; } -QString QPEvents::actionName(const QString &fullName) +TQString QPEvents::actionName(const TQString &fullName) { - for (QMap::ConstIterator it = m_actionNames.constBegin(); it != m_actionNames.constEnd(); ++it) + for (TQMap::ConstIterator it = m_actionNames.constBegin(); it != m_actionNames.constEnd(); ++it) { if (fullName == it.data()) return it.key(); @@ -380,20 +380,20 @@ QString QPEvents::actionName(const QString &fullName) return fullName; } -QStringList QPEvents::eventNames() +TQStringList QPEvents::eventNames() { - QStringList names; - for (QMap::ConstIterator it = m_eventNames.constBegin(); it != m_eventNames.constEnd(); ++it) + TQStringList names; + for (TQMap::ConstIterator it = m_eventNames.constBegin(); it != m_eventNames.constEnd(); ++it) { names << it.data(); } return names; } -QStringList QPEvents::actionNames() +TQStringList QPEvents::actionNames() { - QStringList names; - for (QMap::ConstIterator it = m_actionNames.constBegin(); it != m_actionNames.constEnd(); ++it) + TQStringList names; + for (TQMap::ConstIterator it = m_actionNames.constBegin(); it != m_actionNames.constEnd(); ++it) { names << it.data(); } diff --git a/quanta/utility/qpevents.h b/quanta/utility/qpevents.h index 83f6d37b..373ae089 100644 --- a/quanta/utility/qpevents.h +++ b/quanta/utility/qpevents.h @@ -17,7 +17,7 @@ #ifndef QPEVENTS_H #define QPEVENTS_H -#include +#include /** @author Andras Mantia @@ -36,10 +36,10 @@ struct EventAction { this is the name of the script, in case of internal events it can be one of the following: "email" */ - QString action; + TQString action; /** The arguments for the event action. It is different for each action. */ - QStringList arguments; + TQStringList arguments; }; /** The configured events. The key is the event name, the data is the event description. @@ -48,32 +48,32 @@ before a file is saved. Possible key names are: before_save, after_save, after_o after_project_open, after_project_save, before_upload, after_upload, after_project_add, after_project_remove, after_commit */ -typedef QMap > EventActions; +typedef TQMap > EventActions; class QPEvents : public QObject { Q_OBJECT public: - static QPEvents* const ref(QObject *parent = 0L) + static QPEvents* const ref(TQObject *parent = 0L) { static QPEvents *m_ref; if (!m_ref) m_ref = new QPEvents(parent); return m_ref; } ~QPEvents(); - QString fullEventName(const QString &name); - QString fullActionName(const QString &name); - QString eventName(const QString &fullName); - QString actionName(const QString &fullName); - QStringList eventNames(); - QStringList actionNames(); + TQString fullEventName(const TQString &name); + TQString fullActionName(const TQString &name); + TQString eventName(const TQString &fullName); + TQString actionName(const TQString &fullName); + TQStringList eventNames(); + TQStringList actionNames(); public slots: /** Called when an event has happened */ - void slotEventHappened(const QString& name, const QString& argument1, const QString& argument2); + void slotEventHappened(const TQString& name, const TQString& argument1, const TQString& argument2); private: - QPEvents(QObject *parent = 0, const char *name = 0); + QPEvents(TQObject *parent = 0, const char *name = 0); /** Calls the action associated with an event. Returns true if the call succeeded, false otherwise. The call might fail if: - the action type is unknown @@ -82,9 +82,9 @@ private: */ bool handleEvent(const EventAction& ev); - QMap m_eventNames; - QMap m_actionNames; - QString m_eventName; + TQMap m_eventNames; + TQMap m_actionNames; + TQString m_eventName; }; #endif diff --git a/quanta/utility/quantabookmarks.cpp b/quanta/utility/quantabookmarks.cpp index ebca5843..12ba69c5 100644 --- a/quanta/utility/quantabookmarks.cpp +++ b/quanta/utility/quantabookmarks.cpp @@ -31,21 +31,21 @@ #include #include -#include -#include -#include +#include +#include +#include #include "viewmanager.h" #include "document.h" /** Utility: selection sort - sort a QMemArray in ascending order. + sort a TQMemArray in ascending order. max it the largest (zerobased) index to sort. To sort the entire array: ssort( *array, array.size() -1 ); This is only efficient if ran only once. */ -static void ssort( QMemArray &a, int max ) +static void ssort( TQMemArray &a, int max ) { uint tmp, j, maxpos; for ( uint h = max; h >= 1; h-- ) @@ -62,7 +62,7 @@ static void ssort( QMemArray &a, int max ) // TODO add a insort() or bubble_sort - more efficient for aboutToShow() ? QuantaBookmarks::QuantaBookmarks(ViewManager *parent,Sorting sort, bool onlyFromActualDocument ) - : QObject( parent, "bookmarks" ) + : TQObject( parent, "bookmarks" ) , m_sorting(sort) , m_onlyFromActualDocument(onlyFromActualDocument) { @@ -86,38 +86,38 @@ void QuantaBookmarks::init(KActionCollection* ac) { m_bookmarkToggle = new KToggleAction( i18n("Set &Bookmark"), "bookmark", CTRL+Key_B, - this, SLOT(toggleBookmark()), + this, TQT_SLOT(toggleBookmark()), ac, "bookmarks_toggle" ); m_bookmarkToggle->setWhatsThis(i18n("If a line has no bookmark then add one, otherwise remove it.")); m_bookmarkToggle->setCheckedState( i18n("Clear &Bookmark") ); m_bookmarkClear = new KAction( i18n("Clear &All Bookmarks"), 0, - this, SLOT(clearBookmarks()), + this, TQT_SLOT(clearBookmarks()), ac, "bookmarks_clear"); m_bookmarkClear->setWhatsThis(i18n("Remove all bookmarks of the current document.")); m_goNext = new KAction( i18n("Next Bookmark"), "next", ALT + Key_PageDown, - this, SLOT(goNext()), + this, TQT_SLOT(goNext()), ac, "bookmarks_next"); m_goNext->setWhatsThis(i18n("Go to the next bookmark.")); m_goPrevious = new KAction( i18n("Previous Bookmark"), "previous", ALT + Key_PageUp, - this, SLOT(goPrevious()), + this, TQT_SLOT(goPrevious()), ac, "bookmarks_previous"); m_goPrevious->setWhatsThis(i18n("Go to the previous bookmark.")); //connect the aboutToShow() and aboutToHide() signals with //the bookmarkMenuAboutToShow() and bookmarkMenuAboutToHide() slots - connect( m_bookmarksMenu, SIGNAL(aboutToShow()), this, SLOT(bookmarkMenuAboutToShow())); - connect( m_bookmarksMenu, SIGNAL(aboutToHide()), this, SLOT(bookmarkMenuAboutToHide()) ); + connect( m_bookmarksMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(bookmarkMenuAboutToShow())); + connect( m_bookmarksMenu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(bookmarkMenuAboutToHide()) ); marksChanged (); } -void QuantaBookmarks::setBookmarksMenu(QPopupMenu* bookmarksMenu) +void QuantaBookmarks::setBookmarksMenu(TQPopupMenu* bookmarksMenu) { m_bookmarksMenu = bookmarksMenu; @@ -147,7 +147,7 @@ void QuantaBookmarks::clearBookmarks () Document *doc = m_viewManager->activeDocument(); if (doc && doc->markIf) { - QPtrList m = doc->markIf->marks(); + TQPtrList m = doc->markIf->marks(); for (uint i=0; i < m.count(); i++) doc->markIf->removeMark( m.at(i)->line, KTextEditor::MarkInterface::markType01 ); @@ -156,21 +156,21 @@ void QuantaBookmarks::clearBookmarks () } } -int QuantaBookmarks::insertBookmarks(QPopupMenu& menu, Document *doc, bool insertNavigationItems ) +int QuantaBookmarks::insertBookmarks(TQPopupMenu& menu, Document *doc, bool insertNavigationItems ) { int insertedItems = 0; if (doc->markIf) { uint line = doc->viewCursorIf->cursorLine(); - const QRegExp re("&(?!&)"); + const TQRegExp re("&(?!&)"); int idx( -1 ); int old_menu_count = menu.count(); KTextEditor::Mark *next = 0; KTextEditor::Mark *prev = 0; - QPtrList m = doc->markIf->marks(); - QMemArray sortArray( m.count() ); - QPtrListIterator it( m ); + TQPtrList m = doc->markIf->marks(); + TQMemArray sortArray( m.count() ); + TQPtrListIterator it( m ); if ( it.count() > 0 && insertNavigationItems) menu.insertSeparator(); @@ -179,7 +179,7 @@ int QuantaBookmarks::insertBookmarks(QPopupMenu& menu, Document *doc, bool inser { if( (*it)->type & KTextEditor::MarkInterface::markType01 ) { - QString bText = KStringHandler::rEmSqueeze + TQString bText = KStringHandler::rEmSqueeze ( doc->editIf->textLine( (*it)->line ), menu.fontMetrics(), 32 ); bText.replace(re, "&&"); // kill undesired accellerators! @@ -196,7 +196,7 @@ int QuantaBookmarks::insertBookmarks(QPopupMenu& menu, Document *doc, bool inser } menu.insertItem( - QString("%1 - \"%2\"").arg( (*it)->line+1 ).arg( bText ), + TQString("%1 - \"%2\"").arg( (*it)->line+1 ).arg( bText ), 0, (*it)->line, idx ); insertedItems++; @@ -234,7 +234,7 @@ int QuantaBookmarks::insertBookmarks(QPopupMenu& menu, Document *doc, bool inser if ( next || prev ) menu.insertSeparator( idx ); } - connect(&menu, SIGNAL(activated(int)), this, SLOT(gotoLineNumber(int))); + connect(&menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(gotoLineNumber(int))); } return insertedItems; } @@ -259,10 +259,10 @@ void QuantaBookmarks::bookmarkMenuAboutToShow() Document *doc = m_doc; if (!doc) doc = m_viewManager->activeDocument(); - QValueList openedDocuments = m_viewManager->openedDocuments(); + TQValueList openedDocuments = m_viewManager->openedDocuments(); if (doc && doc->markIf) { - QPtrList m = doc->markIf->marks(); + TQPtrList m = doc->markIf->marks(); if (!m_onlyFromActualDocument) { @@ -279,11 +279,11 @@ void QuantaBookmarks::bookmarkMenuAboutToShow() if (!m_onlyFromActualDocument) { int i = 0; - for (QValueList::Iterator it = openedDocuments.begin(); it != openedDocuments.end(); ++it) + for (TQValueList::Iterator it = openedDocuments.begin(); it != openedDocuments.end(); ++it) { if (*it != doc) { - QPopupMenu *menu = new QPopupMenu(m_bookmarksMenu); + TQPopupMenu *menu = new TQPopupMenu(m_bookmarksMenu); m_bookmarksMenu->insertItem((*it)->url().fileName(), menu); if (insertBookmarks(*menu, *it, false) > 0) { @@ -317,7 +317,7 @@ void QuantaBookmarks::goNext() doc = m_viewManager->activeDocument(); if (doc && doc->markIf) { - QPtrList m = doc->markIf->marks(); + TQPtrList m = doc->markIf->marks(); if (m.isEmpty()) return; @@ -340,7 +340,7 @@ void QuantaBookmarks::goPrevious() doc = m_viewManager->activeDocument(); if (doc && doc->markIf) { - QPtrList m = doc->markIf->marks(); + TQPtrList m = doc->markIf->marks(); if (m.isEmpty()) return; @@ -361,7 +361,7 @@ void QuantaBookmarks::gotoLineNumber(int line) Document *doc = m_doc; if (!doc) doc = m_viewManager->activeDocument(); - const QObject *s = sender(); + const TQObject *s = sender(); for (uint i = 0; i < m_othersMenuList.count(); i++) { if (s == m_othersMenuList[i]) diff --git a/quanta/utility/quantabookmarks.h b/quanta/utility/quantabookmarks.h index 10c0aad4..5170a774 100644 --- a/quanta/utility/quantabookmarks.h +++ b/quanta/utility/quantabookmarks.h @@ -24,8 +24,8 @@ Quanta, so it works over multiple document */ #ifndef QUANTABOOKMARKS_H #define QUANTABOOKMARKS_H -#include -#include +#include +#include namespace KTextEditor { class Mark; } @@ -50,14 +50,14 @@ class QuantaBookmarks : public QObject virtual ~QuantaBookmarks(); void createActions( KActionCollection* ); - void setBookmarksMenu(QPopupMenu* bookmarksMenu); + void setBookmarksMenu(TQPopupMenu* bookmarksMenu); QuantaBookmarks::Sorting sorting() { return m_sorting; }; void setSorting( Sorting s ) { m_sorting = s; }; void setDocument(Document *doc) {m_doc = doc;} protected: - int insertBookmarks(QPopupMenu& menu, Document *doc, bool insertNavigationItems = true); + int insertBookmarks(TQPopupMenu& menu, Document *doc, bool insertNavigationItems = true); void init(KActionCollection* ac = 0L); private slots: @@ -74,7 +74,7 @@ class QuantaBookmarks : public QObject void marksChanged (); signals: - void gotoFileAndLine(const QString&, int, int); + void gotoFileAndLine(const TQString&, int, int); private: KToggleAction* m_bookmarkToggle; @@ -83,9 +83,9 @@ class QuantaBookmarks : public QObject KAction* m_goPrevious; Sorting m_sorting; - QPopupMenu* m_bookmarksMenu; - QValueList m_othersMenuList; - QValueList m_others; + TQPopupMenu* m_bookmarksMenu; + TQValueList m_othersMenuList; + TQValueList m_others; ViewManager* m_viewManager; Document *m_doc; bool m_onlyFromActualDocument; diff --git a/quanta/utility/quantacommon.cpp b/quanta/utility/quantacommon.cpp index 7cc7fb1b..93421764 100644 --- a/quanta/utility/quantacommon.cpp +++ b/quanta/utility/quantacommon.cpp @@ -18,13 +18,13 @@ #include //qt includes -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include //kde includes #include @@ -48,10 +48,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "qextfileinfo.h" #include "quantacommon.h" @@ -61,22 +61,22 @@ QConfig qConfig; //holds the main configuration settings -QString tmpDir; +TQString tmpDir; -QRegExp scriptBeginRx; -QRegExp scriptEndRx; +TQRegExp scriptBeginRx; +TQRegExp scriptEndRx; Node *baseNode; Parser *parser; KDirWatch *fileWatcher; KProgress *progressBar; -QString toolbarExtension = ".toolbar.tgz"; -QRegExp newLineRx("\\n"); -QStringList charList; //hold the list of the &char; chars. See the data/chars file. -QMap replacementMap; -QPtrList tempFileList; -QPtrList tempDirList; +TQString toolbarExtension = ".toolbar.tgz"; +TQRegExp newLineRx("\\n"); +TQStringList charList; //hold the list of the &char; chars. See the data/chars file. +TQMap replacementMap; +TQPtrList tempFileList; +TQPtrList tempDirList; bool typingInProgress; QuantaCommon::QuantaCommon(){ @@ -86,9 +86,9 @@ QuantaCommon::~QuantaCommon(){ } /** convert tag to upper or lower case */ -QString QuantaCommon::tagCase( const QString& tag) +TQString QuantaCommon::tagCase( const TQString& tag) { - QString sTag = tag; + TQString sTag = tag; switch (qConfig.tagCase) { @@ -100,9 +100,9 @@ QString QuantaCommon::tagCase( const QString& tag) } /** convert attr of tag to upper or lower case */ -QString QuantaCommon::attrCase( const QString& attr) +TQString QuantaCommon::attrCase( const TQString& attr) { - QString sAttr = attr; + TQString sAttr = attr; switch (qConfig.attrCase) { @@ -115,14 +115,14 @@ QString QuantaCommon::attrCase( const QString& attr) /** returns the attribute value in quoted form, by taking care of the quotation setting*/ -QString QuantaCommon::quoteAttributeValue(const QString& value) +TQString QuantaCommon::quoteAttributeValue(const TQString& value) { - QString quote = qConfig.attrValueQuotation; + TQString quote = qConfig.attrValueQuotation; return quote + value + quote; } /** Set's up the url correctly from urlString. */ -void QuantaCommon::setUrl(KURL &url, const QString& urlString) +void QuantaCommon::setUrl(KURL &url, const TQString& urlString) { KURL oldUrl = url; url = urlString; @@ -136,7 +136,7 @@ void QuantaCommon::setUrl(KURL &url, const QString& urlString) } /** No descriptions */ -bool QuantaCommon::isSingleTag(const QString& dtdName, const QString& tag) +bool QuantaCommon::isSingleTag(const TQString& dtdName, const TQString& tag) { bool single = false; @@ -147,7 +147,7 @@ bool QuantaCommon::isSingleTag(const QString& dtdName, const QString& tag) const DTDStruct* dtd = DTDs::ref()->find(dtdName); if (dtd && !tag.isEmpty()) { - QString searchForTag = (dtd->caseSensitive) ? tag : tag.upper(); + TQString searchForTag = (dtd->caseSensitive) ? tag : tag.upper(); QTag* qtag = dtd->tagsList->find(searchForTag); if (qtag) single = qtag->isSingle(); @@ -157,14 +157,14 @@ bool QuantaCommon::isSingleTag(const QString& dtdName, const QString& tag) } /** No descriptions */ -bool QuantaCommon::isOptionalTag(const QString& dtdName, const QString& tag) +bool QuantaCommon::isOptionalTag(const TQString& dtdName, const TQString& tag) { bool optional = false; const DTDStruct* dtd = DTDs::ref()->find(dtdName); if (dtd && !tag.isEmpty()) { - QString searchForTag = (dtd->caseSensitive) ? tag : tag.upper(); + TQString searchForTag = (dtd->caseSensitive) ? tag : tag.upper(); QTag* qtag = dtd->tagsList->find(searchForTag); if (qtag) optional = qtag->isOptional(); @@ -173,14 +173,14 @@ bool QuantaCommon::isOptionalTag(const QString& dtdName, const QString& tag) return optional; } /** No descriptions */ -bool QuantaCommon::isKnownTag(const QString& dtdName, const QString& tag) +bool QuantaCommon::isKnownTag(const TQString& dtdName, const TQString& tag) { bool known = false; const DTDStruct* dtd = DTDs::ref()->find(dtdName); if (dtd && !tag.isEmpty()) { - QString searchForTag = (dtd->caseSensitive) ? tag : tag.upper(); + TQString searchForTag = (dtd->caseSensitive) ? tag : tag.upper(); if (dtd->tagsList->find(searchForTag)) known = true; } @@ -188,14 +188,14 @@ bool QuantaCommon::isKnownTag(const QString& dtdName, const QString& tag) return known; } -AttributeList* QuantaCommon::tagAttributes(const QString& dtdName, const QString& tag) +AttributeList* QuantaCommon::tagAttributes(const TQString& dtdName, const TQString& tag) { AttributeList* attrs = 0L; const DTDStruct* dtd = DTDs::ref()->find(dtdName); if (dtd && !tag.isEmpty()) { - QString searchForTag = (dtd->caseSensitive) ? tag : tag.upper(); + TQString searchForTag = (dtd->caseSensitive) ? tag : tag.upper(); QTag* qtag = dtd->tagsList->find(searchForTag); if (qtag) attrs = qtag->attributes(); @@ -205,19 +205,19 @@ AttributeList* QuantaCommon::tagAttributes(const QString& dtdName, const QString } /** Returns the QTag object for the tag "tag" from the DTD named "dtdname". */ -QTag* QuantaCommon::tagFromDTD(const QString& dtdName, const QString& tag) +QTag* QuantaCommon::tagFromDTD(const TQString& dtdName, const TQString& tag) { const DTDStruct* dtd = DTDs::ref()->find(dtdName); return tagFromDTD(dtd, tag); } /** Returns the QTag object for the tag "tag" from the DTD. */ -QTag* QuantaCommon::tagFromDTD(const DTDStruct *dtd, const QString& tag) +QTag* QuantaCommon::tagFromDTD(const DTDStruct *dtd, const TQString& tag) { QTag *qtag = 0; if (dtd && !tag.isEmpty()) { - QString searchForTag = (dtd->caseSensitive) ? tag : tag.upper(); + TQString searchForTag = (dtd->caseSensitive) ? tag : tag.upper(); qtag = dtd->tagsList->find(searchForTag); } @@ -234,18 +234,18 @@ QTag* QuantaCommon::tagFromDTD(Node *node) } /** Returns an XML style string containing the GUI for attributes. */ -QString QuantaCommon::xmlFromAttributes(AttributeList* attributes) +TQString QuantaCommon::xmlFromAttributes(AttributeList* attributes) { - QString xmlStr; - QTextStream stream( &xmlStr, IO_WriteOnly ); - stream.setEncoding(QTextStream::UnicodeUTF8); + TQString xmlStr; + TQTextStream stream( &xmlStr, IO_WriteOnly ); + stream.setEncoding(TQTextStream::UnicodeUTF8); if (attributes) { int row = 0; for ( uint i = 0; i< attributes->count();i++) { Attribute *attribute = attributes->at(i); - QString name = attribute->name.left(1).upper()+attribute->name.right(attribute->name.length()-1); + TQString name = attribute->name.left(1).upper()+attribute->name.right(attribute->name.length()-1); stream << " name +"\" type=\""+attribute->type+"\""; if (!attribute->defaultValue.isEmpty()) stream << " defaultValue=\"" + attribute->defaultValue + "\""; @@ -301,13 +301,13 @@ KStandardDirs* QuantaCommon::pluginDirs(const char *type) return dirs; } /** Return true, if the url belong to the mimetype group. */ -bool QuantaCommon::checkMimeGroup(const KURL& url, const QString& group) +bool QuantaCommon::checkMimeGroup(const KURL& url, const TQString& group) { KMimeType::List list = KMimeType::allMimeTypes(); KMimeType::List::iterator it; bool status = false; KMimeType::Ptr mime = KMimeType::findByURL(url); - QString mimetype = mime->name(); + TQString mimetype = mime->name(); mimetype = mimetype.section('/',-1); for ( it = list.begin(); it != list.end(); ++it ) { @@ -327,7 +327,7 @@ bool QuantaCommon::checkMimeGroup(const KURL& url, const QString& group) status = true; } else { - QVariant v = mime->property("X-KDE-text"); + TQVariant v = mime->property("X-KDE-text"); if (v.isValid()) status = v.toBool(); } @@ -339,10 +339,10 @@ bool QuantaCommon::checkMimeGroup(const KURL& url, const QString& group) } /** Return true, if the url has the mimetype type. */ -bool QuantaCommon::checkMimeType(const KURL& url, const QString& type) +bool QuantaCommon::checkMimeType(const KURL& url, const TQString& type) { bool status = false; - QString mimetype = KMimeType::findByURL(url)->name(); + TQString mimetype = KMimeType::findByURL(url)->name(); mimetype = mimetype.section('/',-1); if (mimetype == type) status = true; @@ -350,10 +350,10 @@ bool QuantaCommon::checkMimeType(const KURL& url, const QString& type) } /** Return true, if the url has exactly the mimetype type. */ -bool QuantaCommon::checkExactMimeType(const KURL& url, const QString& type) +bool QuantaCommon::checkExactMimeType(const KURL& url, const TQString& type) { bool status = false; - QString mimetype = KMimeType::findByURL(url)->name(); + TQString mimetype = KMimeType::findByURL(url)->name(); if (mimetype == type) status = true; return status; @@ -371,15 +371,15 @@ KURL QuantaCommon::convertToPath(const KURL& url) /** Return a string to be used when an url is saved to the project file. Returns url.url() if it's an absolute url and url.path() if the url is relative */ -QString QuantaCommon::qUrl(const KURL &url) +TQString QuantaCommon::qUrl(const KURL &url) { - QString result = url.path(); + TQString result = url.path(); if (url.path().startsWith("/")) result = url.url(); return result; } /** No descriptions */ -void QuantaCommon::dirCreationError(QWidget *widget, const KURL& url) +void QuantaCommon::dirCreationError(TQWidget *widget, const KURL& url) { KMessageBox::error(widget, i18n("Cannot create folder
%1.
Check that you have write permission in the parent folder or that the connection to
%2
is valid.
") .arg(url.prettyURL(0, KURL::StripFileProtocol)) @@ -388,26 +388,26 @@ void QuantaCommon::dirCreationError(QWidget *widget, const KURL& url) /** Adds the backslash before the special chars (like ?, *, . ) so the returned string can be used in regular expressions.*/ -QString QuantaCommon::makeRxCompatible(const QString& s) +TQString QuantaCommon::makeRxCompatible(const TQString& s) { const uint max = 7; - const QRegExp rxs[max]={QRegExp("\\?"), - QRegExp("\\*"), - QRegExp("\\."), - QRegExp("\\^"), - QRegExp("\\$"), - QRegExp("\\{"), - QRegExp("\\}") + const TQRegExp rxs[max]={TQRegExp("\\?"), + TQRegExp("\\*"), + TQRegExp("\\."), + TQRegExp("\\^"), + TQRegExp("\\$"), + TQRegExp("\\{"), + TQRegExp("\\}") }; - const QString strs[max]={QString("\\?"), - QString("\\*"), - QString("\\."), - QString("\\^"), - QString("\\$"), - QString("\\{"), - QString("\\}") + const TQString strs[max]={TQString("\\?"), + TQString("\\*"), + TQString("\\."), + TQString("\\^"), + TQString("\\$"), + TQString("\\{"), + TQString("\\}") }; - QString str = s; + TQString str = s; for (uint i = 0; i < max - 1; i++) { str.replace(rxs[i], strs[i]); @@ -417,11 +417,11 @@ QString QuantaCommon::makeRxCompatible(const QString& s) } /** Returns the translated a_str in English. A "back-translation" useful e.g in case of CSS elements selected from a listbox. */ -QString QuantaCommon::i18n2normal(const QString& a_str) +TQString QuantaCommon::i18n2normal(const TQString& a_str) { -//TODO: a QMap lookup would be faster, but we need a pre-built QMap +//TODO: a TQMap lookup would be faster, but we need a pre-built TQMap const int keywordNum = 15 *5; - const QString keywords[keywordNum] = + const TQString keywords[keywordNum] = {"normal", "italic", "oblique", "serif", "sans-serif", "cursive", "fantasy", "monospace", "small-caps", "lighter", "bold", "bolder", "xx-small", "x-small", "small", @@ -437,7 +437,7 @@ QString QuantaCommon::i18n2normal(const QString& a_str) "none", "pre", "nowrap", "disc", "circle", "square", "decimal", "lower-roman","upper-roman","lower-alpha", "upper-alpha","inside","outside", "auto", "both" }; - QString str = a_str; + TQString str = a_str; if (!a_str.isEmpty()) { for (int i = 0; i < keywordNum; i++) @@ -452,15 +452,15 @@ QString QuantaCommon::i18n2normal(const QString& a_str) return str; } -static const QChar space(' '); +static const TQChar space(' '); -void QuantaCommon::removeCommentsAndQuotes(QString &str, const DTDStruct *dtd) +void QuantaCommon::removeCommentsAndQuotes(TQString &str, const DTDStruct *dtd) { //Replace all the commented strings and the escaped quotation marks (\", \') // with spaces so they will not mess up our parsing int pos = 0; int l; - QString s; + TQString s; while (pos != -1) { pos = dtd->commentsStartRx.search(str, pos); @@ -500,7 +500,7 @@ void QuantaCommon::removeCommentsAndQuotes(QString &str, const DTDStruct *dtd) } //Now replace the quoted strings with spaces - QRegExp strRx("(\"[^\"]*\"|'[^']*')"); + TQRegExp strRx("(\"[^\"]*\"|'[^']*')"); pos = 0; while (pos != -1) { @@ -518,13 +518,13 @@ void QuantaCommon::removeCommentsAndQuotes(QString &str, const DTDStruct *dtd) } -bool QuantaCommon::insideCommentsOrQuotes(int position, const QString &string, const DTDStruct *dtd) +bool QuantaCommon::insideCommentsOrQuotes(int position, const TQString &string, const DTDStruct *dtd) { //Return true if position is inside a commented or quoted string - QString str = string; + TQString str = string; int pos = 0; int l; - QString s; + TQString s; while (pos != -1) { pos = dtd->commentsStartRx.search(str, pos); @@ -568,7 +568,7 @@ bool QuantaCommon::insideCommentsOrQuotes(int position, const QString &string, c } //Now replace the quoted strings with spaces - const QRegExp strRx("(\"[^\"]*\"|'[^']*')"); + const TQRegExp strRx("(\"[^\"]*\"|'[^']*')"); pos = 0; while (pos != -1) { @@ -589,14 +589,14 @@ bool QuantaCommon::insideCommentsOrQuotes(int position, const QString &string, c return false; } -DCOPReply QuantaCommon::callDCOPMethod(const QString& interface, const QString& method, const QString& arguments) +DCOPReply QuantaCommon::callDCOPMethod(const TQString& interface, const TQString& method, const TQString& arguments) { - QStringList argumentList = QStringList::split(",", arguments, true); - QString app = "quanta"; + TQStringList argumentList = TQStringList::split(",", arguments, true); + TQString app = "quanta"; if (!kapp->inherits("KUniqueApplication")) { pid_t pid = ::getpid(); - app += QString("-%1").arg(pid); + app += TQString("-%1").arg(pid); } DCOPRef quantaRef(app.utf8(), interface.utf8()); DCOPReply reply; @@ -627,7 +627,7 @@ DCOPReply QuantaCommon::callDCOPMethod(const QString& interface, const QString& return reply; } -void QuantaCommon::normalizeStructure(QString f,QStringList& l) +void QuantaCommon::normalizeStructure(TQString f,TQStringList& l) { f.remove("\t"); f.remove("\n"); @@ -635,7 +635,7 @@ void QuantaCommon::normalizeStructure(QString f,QStringList& l) while(f.contains("<")) { - QString z(f); + TQString z(f); z.truncate(z.find(">")+1); z.remove(0,z.find("<")); f.remove(0,f.find(">")+1); @@ -649,26 +649,26 @@ bool QuantaCommon::closesTag(Tag *tag1, Tag *tag2) { if (!tag2->nameSpace.isEmpty()) return false; //namespace missmatch - QString tag1Name = tag1->dtd()->caseSensitive ? tag1->name : tag1->name.upper(); - QString tag2Name = tag2->dtd()->caseSensitive ? tag2->name : tag2->name.upper(); + TQString tag1Name = tag1->dtd()->caseSensitive ? tag1->name : tag1->name.upper(); + TQString tag2Name = tag2->dtd()->caseSensitive ? tag2->name : tag2->name.upper(); if ("/" + tag1Name != tag2Name) return false; //not the closing tag } else { if (tag2->nameSpace.isEmpty()) return false; //namespace missmatch - QString tag1Name = tag1->dtd()->caseSensitive ? (tag1->nameSpace + tag1->name) : (tag1->nameSpace.upper() + tag1->name.upper()); - QString tag2Name = tag2->dtd()->caseSensitive ? (tag2->nameSpace + tag2->name) : (tag2->nameSpace.upper() + tag2->name.upper()); + TQString tag1Name = tag1->dtd()->caseSensitive ? (tag1->nameSpace + tag1->name) : (tag1->nameSpace.upper() + tag1->name.upper()); + TQString tag2Name = tag2->dtd()->caseSensitive ? (tag2->nameSpace + tag2->name) : (tag2->nameSpace.upper() + tag2->name.upper()); if ("/" + tag1Name != tag2Name) return false; //namespace missmatch or not the closing tag } return true; } -bool QuantaCommon::closesTag(QString namespaceName, QString tagName, bool caseSensitive, - QString namespaceName2, QString tagName2, bool caseSensitive2) +bool QuantaCommon::closesTag(TQString namespaceName, TQString tagName, bool caseSensitive, + TQString namespaceName2, TQString tagName2, bool caseSensitive2) { - QString tag1Name, tag2Name; + TQString tag1Name, tag2Name; if(namespaceName.isEmpty()) { if(!namespaceName.isEmpty()) @@ -692,7 +692,7 @@ bool QuantaCommon::closesTag(QString namespaceName, QString tagName, bool caseSe return true; } -int QuantaCommon::denyBinaryInsert(QWidget *window) +int QuantaCommon::denyBinaryInsert(TQWidget *window) { int result = KMessageBox::questionYesNo(window, i18n("The file type is not recognized. \ Opening binary files may confuse Quanta.\n Are you sure you want to open this file?"), @@ -700,25 +700,25 @@ int QuantaCommon::denyBinaryInsert(QWidget *window) return result; } -bool QuantaCommon::checkOverwrite(const KURL& url, QWidget *window) +bool QuantaCommon::checkOverwrite(const KURL& url, TQWidget *window) { bool result = true; if (QExtFileInfo::exists(url, false, window)) { if (KMessageBox::warningContinueCancel(window, - i18n( "The file %1 already exists.
Do you want to overwrite it?
" ).arg(url.prettyURL(0, KURL::StripFileProtocol)), QString::null, i18n("Overwrite")) == KMessageBox::Cancel) + i18n( "The file %1 already exists.
Do you want to overwrite it?
" ).arg(url.prettyURL(0, KURL::StripFileProtocol)), TQString::null, i18n("Overwrite")) == KMessageBox::Cancel) result = false; } return result; } -QStringList QuantaCommon::readPathListEntry(KConfig *config, const QString &pKey) +TQStringList QuantaCommon::readPathListEntry(KConfig *config, const TQString &pKey) { - QStringList list = config->readPathListEntry(pKey); - QStringList::Iterator end = list.end(); - for (QStringList::Iterator it = list.begin(); it != end; ++it) + TQStringList list = config->readPathListEntry(pKey); + TQStringList::Iterator end = list.end(); + for (TQStringList::Iterator it = list.begin(); it != end; ++it) { KURL u = KURL::fromPathOrURL(*it); if (u.isValid() && u.isLocalFile()) @@ -730,9 +730,9 @@ QStringList QuantaCommon::readPathListEntry(KConfig *config, const QString &pKey return list; } -QString QuantaCommon::readPathEntry(KConfig *config, const QString &pKey) +TQString QuantaCommon::readPathEntry(KConfig *config, const TQString &pKey) { - QString path = config->readPathEntry(pKey); + TQString path = config->readPathEntry(pKey); KURL u = KURL::fromPathOrURL(path); if (u.isValid() && u.isLocalFile()) { @@ -742,12 +742,12 @@ QString QuantaCommon::readPathEntry(KConfig *config, const QString &pKey) return path; } -QString QuantaCommon::encodedChar(uint code) +TQString QuantaCommon::encodedChar(uint code) { if (replacementMap.contains(code)) - return QString("%1;").arg(replacementMap[code]); + return TQString("%1;").arg(replacementMap[code]); else - return QString("&#%1;").arg(code); + return TQString("&#%1;").arg(code); } diff --git a/quanta/utility/quantacommon.h b/quanta/utility/quantacommon.h index a88276b7..c9e283fa 100644 --- a/quanta/utility/quantacommon.h +++ b/quanta/utility/quantacommon.h @@ -26,7 +26,7 @@ *@author Andras Mantia */ -#define DEFAULT_DTD QString("-//W3C//DTD HTML 4.01 Transitional//EN") +#define DEFAULT_DTD TQString("-//W3C//DTD HTML 4.01 Transitional//EN") class QString; class DCOPReply; @@ -42,8 +42,8 @@ class KPopupMenu; class Abbreviation{ public: /*A list with abbreviations in the for of: