summaryrefslogtreecommitdiffstats
path: root/interfaces
diff options
context:
space:
mode:
Diffstat (limited to 'interfaces')
-rw-r--r--interfaces/khexedit/byteseditinterface.h6
-rw-r--r--interfaces/khexedit/clipboardinterface.h4
-rw-r--r--interfaces/khexedit/valuecolumninterface.h4
-rw-r--r--interfaces/kimproxy/interface/kimiface.h16
-rw-r--r--interfaces/kimproxy/library/kimproxy.cpp20
-rw-r--r--interfaces/kimproxy/library/kimproxy.h6
-rw-r--r--interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp8
-rw-r--r--interfaces/kmediaplayer/player.h4
-rw-r--r--interfaces/kregexpeditor/kregexpeditorinterface.h4
-rw-r--r--interfaces/kscript/scriptinterface.desktop2
-rw-r--r--interfaces/kscript/scriptinterface.h2
-rw-r--r--interfaces/kscript/scriptloader.h2
-rw-r--r--interfaces/kscript/scriptmanager.cpp2
-rw-r--r--interfaces/kspeech/kspeech.h20
-rw-r--r--interfaces/ktexteditor/.kateconfig2
-rw-r--r--interfaces/ktexteditor/blockselectiondcopinterface.h2
-rw-r--r--interfaces/ktexteditor/clipboarddcopinterface.h2
-rw-r--r--interfaces/ktexteditor/documentdcopinfo.h2
-rw-r--r--interfaces/ktexteditor/editdcopinterface.h2
-rw-r--r--interfaces/ktexteditor/editinterfaceext.h2
-rw-r--r--interfaces/ktexteditor/editor.h4
-rw-r--r--interfaces/ktexteditor/editorchooser.cpp10
-rw-r--r--interfaces/ktexteditor/editorchooser.h2
-rw-r--r--interfaces/ktexteditor/editorchooser_ui.ui12
-rw-r--r--interfaces/ktexteditor/encodingdcopinterface.h2
-rw-r--r--interfaces/ktexteditor/ktexteditor.cpp4
-rw-r--r--interfaces/ktexteditor/markinterface.h2
-rw-r--r--interfaces/ktexteditor/plugin.h2
-rw-r--r--interfaces/ktexteditor/printdcopinterface.h2
-rw-r--r--interfaces/ktexteditor/searchdcopinterface.cpp20
-rw-r--r--interfaces/ktexteditor/searchdcopinterface.h22
-rw-r--r--interfaces/ktexteditor/selectiondcopinterface.h2
-rw-r--r--interfaces/ktexteditor/templateinterface.cpp4
-rw-r--r--interfaces/ktexteditor/templateinterface.h4
-rw-r--r--interfaces/ktexteditor/undodcopinterface.h2
-rw-r--r--interfaces/ktexteditor/viewcursordcopinterface.h2
-rw-r--r--interfaces/ktexteditor/viewstatusmsgdcopinterface.cpp12
-rw-r--r--interfaces/ktexteditor/viewstatusmsgdcopinterface.h26
-rw-r--r--interfaces/ktexteditor/viewstatusmsginterface.cpp36
-rw-r--r--interfaces/ktexteditor/viewstatusmsginterface.h22
40 files changed, 152 insertions, 152 deletions
diff --git a/interfaces/khexedit/byteseditinterface.h b/interfaces/khexedit/byteseditinterface.h
index f2ec1e7bd..dc0a9dca5 100644
--- a/interfaces/khexedit/byteseditinterface.h
+++ b/interfaces/khexedit/byteseditinterface.h
@@ -143,8 +143,8 @@ class BytesEditInterface
virtual bool isModified() const = 0;
public: // call for action
- /** tqrepaint the indizes from i1 to i2 */
- virtual void tqrepaintRange( int i1, int i2 ) = 0;
+ /** repaint the indizes from i1 to i2 */
+ virtual void repaintRange( int i1, int i2 ) = 0;
};
@@ -221,7 +221,7 @@ inline BytesEditInterface *bytesEditInterface( T *t )
inline TQWidget *createBytesEditWidget( TQWidget *Parent = 0, const char *Name = 0 )
{
return KParts::ComponentFactory::createInstanceFromQuery<TQWidget>
- ( TQString::tqfromLatin1("KHexEdit/KBytesEdit"), TQString::null, Parent, Name );
+ ( TQString::fromLatin1("KHexEdit/KBytesEdit"), TQString::null, Parent, Name );
}
}
diff --git a/interfaces/khexedit/clipboardinterface.h b/interfaces/khexedit/clipboardinterface.h
index da7dd114c..eeaf9d391 100644
--- a/interfaces/khexedit/clipboardinterface.h
+++ b/interfaces/khexedit/clipboardinterface.h
@@ -52,14 +52,14 @@ class ClipboardInterface
virtual void cut() = 0;
/** tries to paste.
* If there is nothing to paste or paste is not possible this call is a noop.
- * Use BytesEditInterface::isReadOnly() to tqfind out if you can paste at all.
+ * Use BytesEditInterface::isReadOnly() to find out if you can paste at all.
*/
virtual void paste() = 0;
public: // signals
/** signal: tells whether copy is possible or not.
* Remember to use the created object, not the interface for connecting
- * Use BytesEditInterface::isReadOnly() to tqfind out if you can also cut
+ * Use BytesEditInterface::isReadOnly() to find out if you can also cut
* As this function symbol serves as a signal, this is a noop. Don't use it
* for anything else.
*/
diff --git a/interfaces/khexedit/valuecolumninterface.h b/interfaces/khexedit/valuecolumninterface.h
index b21934a1d..7dafa7d42 100644
--- a/interfaces/khexedit/valuecolumninterface.h
+++ b/interfaces/khexedit/valuecolumninterface.h
@@ -47,14 +47,14 @@ class ValueColumnInterface
MaxCodingId=0xFFFF
};
- /** collection of ids for the fitting of the tqlayout into the available widget's width */
+ /** collection of ids for the fitting of the layout into the available widget's width */
enum KResizeStyle
{
/** we don't care about the actual sizing of the widget
* but stick to the given NoOfBytesPerLine
*/
NoResize=0,
- /** we try to fit the tqlayout to the available width
+ /** we try to fit the layout to the available width
* but only with full groups like set in NoOfGroupedBytes
* with minimum of one full group
*/
diff --git a/interfaces/kimproxy/interface/kimiface.h b/interfaces/kimproxy/interface/kimiface.h
index dcf210f23..f3212df6d 100644
--- a/interfaces/kimproxy/interface/kimiface.h
+++ b/interfaces/kimproxy/interface/kimiface.h
@@ -179,7 +179,7 @@ k_dcop:
*
* @see allContacts()
* @see presenceString()
- * @see presencetqStatus()
+ * @see presenceStatus()
* @see KABC::Addressee::uid()
*/
virtual bool isPresent( const TQString & uid ) = 0;
@@ -197,7 +197,7 @@ k_dcop:
*
* @see isPresent()
* @see presenceString()
- * @see presencetqStatus()
+ * @see presenceStatus()
* @see KABC::Addressee::uid()
*/
virtual TQString displayName( const TQString & uid ) = 0;
@@ -214,7 +214,7 @@ k_dcop:
* TQString::null if the UID is unknown
*
* @see isPresent()
- * @see presencetqStatus()
+ * @see presenceStatus()
* @see KABC::Addressee::uid()
*/
virtual TQString presenceString( const TQString & uid ) = 0;
@@ -247,7 +247,7 @@ k_dcop:
* @see presenceString()
* @see KABC::Addressee::uid()
*/
- virtual int presencetqStatus( const TQString & uid ) = 0;
+ virtual int presenceStatus( const TQString & uid ) = 0;
/**
* @brief Indicate if a given contact can receive files
@@ -309,7 +309,7 @@ k_dcop:
*
* @see isPresent()
* @see presenceString()
- * @see presencetqStatus()
+ * @see presenceStatus()
* @see KABC::Addressee::uid()
*/
virtual TQPixmap icon( const TQString & uid ) = 0;
@@ -467,7 +467,7 @@ k_dcop_signals:
/**
* @brief Indicates that a contact's presence has changed
*
- * Notifies connected DCOP tqreceivers about a change in a contact's
+ * Notifies connected DCOP receivers about a change in a contact's
* presence.
*
* Implementations just have to call this method with the appropriate
@@ -476,9 +476,9 @@ k_dcop_signals:
* @param uid the KABC UID whose presence changed
* @param appId the DCOP application ID of the program the signal
* originates from
- * @param presence the new presence's numeric value. See presencetqStatus()
+ * @param presence the new presence's numeric value. See presenceStatus()
*
- * @see presencetqStatus()
+ * @see presenceStatus()
* @see KABC::Addressee::uid()
* @see DCOPClient::appId()
*/
diff --git a/interfaces/kimproxy/library/kimproxy.cpp b/interfaces/kimproxy/library/kimproxy.cpp
index 3ca9ae7b1..44f828a02 100644
--- a/interfaces/kimproxy/library/kimproxy.cpp
+++ b/interfaces/kimproxy/library/kimproxy.cpp
@@ -248,7 +248,7 @@ bool KIMProxy::initialize()
{
m_apps_available = true;
//kdDebug( 790 ) << " app name: " << (*offer)->name() << ", has instance " << *app << ", dcopService: " << dcopService << endl;
- if ( !m_im_client_stubs.tqfind( dcopService ) )
+ if ( !m_im_client_stubs.find( dcopService ) )
{
kdDebug( 790 ) << "App " << *app << ", dcopObjectId " << dcopObjectId << " found, using it for presence info." << endl;
m_im_client_stubs.insert( *app, new KIMIface_stub( d->dc, *app, dcopObjectId ) );
@@ -284,7 +284,7 @@ void KIMProxy::registeredToDCOP( const TQCString& appId )
if ( appId.left( dcopService.length() ) == dcopService )
{
// if it's not already known, insert it
- if ( !m_im_client_stubs.tqfind( appId ) )
+ if ( !m_im_client_stubs.find( appId ) )
{
newApp = true;
kdDebug( 790 ) << "App: " << appId << ", dcopService: " << dcopService << " started, using it for presence info."<< endl;
@@ -301,7 +301,7 @@ void KIMProxy::registeredToDCOP( const TQCString& appId )
void KIMProxy::unregisteredFromDCOP( const TQCString& appId )
{
//kdDebug( 790 ) << k_funcinfo << appId << endl;
- if ( m_im_client_stubs.tqfind( appId ) )
+ if ( m_im_client_stubs.find( appId ) )
{
kdDebug( 790 ) << appId << " quit, removing its presence info." << endl;
@@ -558,14 +558,14 @@ bool KIMProxy::imAppsAvailable()
bool KIMProxy::startPreferredApp()
{
TQString preferences = TQString("[X-DCOP-ServiceName] = '%1'").arg( preferredApp() );
- // start/tqfind an instance of DCOP/InstantMessenger
+ // start/find an instance of DCOP/InstantMessenger
TQString error;
TQCString dcopService;
// Get a preferred IM client.
// The app will notify itself to us using registeredToDCOP, so we don't need to record a stub for it here
// FIXME: error in preferences, see debug output
preferences = TQString::null;
- int result = KDCOPServiceStarter::self()->tqfindServiceFor( IM_SERVICE_TYPE, TQString::null, preferences, &error, &dcopService );
+ int result = KDCOPServiceStarter::self()->findServiceFor( IM_SERVICE_TYPE, TQString::null, preferences, &error, &dcopService );
kdDebug( 790 ) << k_funcinfo << "error was: " << error << ", dcopService: " << dcopService << endl;
@@ -578,14 +578,14 @@ void KIMProxy::pollAll( const TQString &uid )
/* // We only need to call this function if we don't have any data at all
// otherwise, the data will be kept fresh by received presence change
// DCOP signals
- if ( !d->presence_map.tqcontains( uid ) )
+ if ( !d->presence_map.contains( uid ) )
{
AppPresence *presence = new AppPresence();
// record current presence from known clients
TQDictIterator<KIMIface_stub> it( m_im_client_stubs );
for ( ; it.current(); ++it )
{
- presence->insert( it.currentKey().ascii(), it.current()->presencetqStatus( uid ) ); // m_im_client_stubs has qstring keys...
+ presence->insert( it.currentKey().ascii(), it.current()->presenceStatus( uid ) ); // m_im_client_stubs has qstring keys...
}
d->presence_map.insert( uid, presence );
}*/
@@ -603,7 +603,7 @@ void KIMProxy::pollApp( const TQCString & appId )
ContactPresenceListCurrent current = d->presence_map[ *it ];
AppPresenceCurrent ap;
ap.appId = appId;
- ap.presence = appStub->presencetqStatus( *it );
+ ap.presence = appStub->presenceStatus( *it );
current.append( ap );
d->presence_map.insert( *it, current );
@@ -618,7 +618,7 @@ KIMIface_stub * KIMProxy::stubForUid( const TQString &uid )
// get best appPresence
AppPresenceCurrent ap = d->presence_map[ uid ].best();
// look up the presence string from that app
- return m_im_client_stubs.tqfind( ap.appId );
+ return m_im_client_stubs.find( ap.appId );
}
KIMIface_stub * KIMProxy::stubForProtocol( const TQString &protocol)
@@ -626,7 +626,7 @@ KIMIface_stub * KIMProxy::stubForProtocol( const TQString &protocol)
KIMIface_stub * app;
// see if the preferred client supports this protocol
TQString preferred = preferredApp();
- if ( ( app = m_im_client_stubs.tqfind( preferred ) ) )
+ if ( ( app = m_im_client_stubs.find( preferred ) ) )
{
if ( app->protocols().grep( protocol ).count() > 0 )
return app;
diff --git a/interfaces/kimproxy/library/kimproxy.h b/interfaces/kimproxy/library/kimproxy.h
index da1561152..d4312b341 100644
--- a/interfaces/kimproxy/library/kimproxy.h
+++ b/interfaces/kimproxy/library/kimproxy.h
@@ -43,8 +43,8 @@ class KURL;
class ContactPresenceListCurrent;
/** FIXME: remove for KDE4, binary compability again. */
-typedef TQMap<TQCString, int> AppPresence; // appId->presence; tqcontains all applications' ideas of a user's presence
-typedef TQDict<AppPresence> PresenceMap; // uid->AppPresence; tqcontains a AppPresences for all users
+typedef TQMap<TQCString, int> AppPresence; // appId->presence; contains all applications' ideas of a user's presence
+typedef TQDict<AppPresence> PresenceMap; // uid->AppPresence; contains a AppPresences for all users
/** FIXME: remove presenceMap and call this presenceMap in KDE4. This hack is for binary compatibility */
typedef TQMap<TQString, ContactPresenceListCurrent> PresenceStringMap;
@@ -301,7 +301,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
* @see isPresent()
* @see presenceString()
* @see presenceIcon()
- * @see KIMIface::presencetqStatus()
+ * @see KIMIface::presenceStatus()
* @see KABC::Addressee::uid()
*/
int presenceNumeric( const TQString& uid );
diff --git a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
index 63527893f..11fa58f27 100644
--- a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
+++ b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
@@ -65,8 +65,8 @@ KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name )
m_supportedFormats.insert( *it, (void*) 1 );
TQVGroupBox *box = new TQVGroupBox( i18n("Media Player"), this );
- TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
- tqlayout->addWidget( box );
+ TQVBoxLayout *layout = new TQVBoxLayout( this );
+ layout->addWidget( box );
(void) new TQWidget( box ); // spacer
@@ -83,7 +83,7 @@ KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name )
{
TQHBox *frame = new TQHBox( box );
frame->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
- frame->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
+ frame->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
view->videoWidget()->reparent( frame, TQPoint(0,0) );
}
@@ -110,7 +110,7 @@ void KFileAudioPreview::showPreview( const KURL &url )
return;
KMimeType::Ptr mt = KMimeType::findByURL( url );
- bool supported = m_supportedFormats.tqfind( mt->name() );
+ bool supported = m_supportedFormats.find( mt->name() );
d->player->view()->setEnabled( supported );
if ( !supported )
return;
diff --git a/interfaces/kmediaplayer/player.h b/interfaces/kmediaplayer/player.h
index 3657a3c1c..10e9f4a74 100644
--- a/interfaces/kmediaplayer/player.h
+++ b/interfaces/kmediaplayer/player.h
@@ -28,7 +28,7 @@
#include <kmediaplayer/playerdcopobject.h>
#include <kmediaplayer/view.h>
-/** KMediaPlayer tqcontains an interface to reusable media player components.
+/** KMediaPlayer contains an interface to reusable media player components.
*/
namespace KMediaPlayer
{
@@ -56,7 +56,7 @@ public:
/** This constructor is what to use when a GUI is required, as in the
* case of a KMediaPlayer/Player.
*/
- Player(TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name);
+ Player(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name);
virtual ~Player(void);
diff --git a/interfaces/kregexpeditor/kregexpeditorinterface.h b/interfaces/kregexpeditor/kregexpeditorinterface.h
index 71e59f404..01fab0fdf 100644
--- a/interfaces/kregexpeditor/kregexpeditorinterface.h
+++ b/interfaces/kregexpeditor/kregexpeditorinterface.h
@@ -59,8 +59,8 @@
* // now use the editor.
* editor->setRegExp("^kde$");
- * // Finally insert the widget into the tqlayout of its parent
- * tqlayout->addWidget( editorWidget );
+ * // Finally insert the widget into the layout of its parent
+ * layout->addWidget( editorWidget );
* }
* else {
* // Don't offer the editor widget.
diff --git a/interfaces/kscript/scriptinterface.desktop b/interfaces/kscript/scriptinterface.desktop
index 4fbd3293f..8e157e20a 100644
--- a/interfaces/kscript/scriptinterface.desktop
+++ b/interfaces/kscript/scriptinterface.desktop
@@ -12,7 +12,7 @@ Comment[ca]=Aquest és un enginy per a provar la interfície de l'script.
Comment[cs]=Toto je obecný testovací skript pro testování skriptovacího rozhranní.
Comment[csb]=Mòduł testowaniô skriptowegò interfejsu.
Comment[cy]=Mae hyn yn beiriant sgript prawf generig i brofi y sgript rhyngwyneb.
-Comment[da]=Dette er en generisk testscript-tqmaskine til at teste scriptgrænsefladen.
+Comment[da]=Dette er en generisk testscript-maskine til at teste scriptgrænsefladen.
Comment[de]=Dies ist eine allgemeine Sammlung von Testroutinen für die Skript-Schnittstelle.
Comment[el]=Αυτό είναι μια γενική μηχανή ελέγχου σεναρίων για τον έλεγχο της διασύνδεσης σεναρίων.
Comment[eo]=Tio estas testprogram-maŝino por testi la programinterfaco.
diff --git a/interfaces/kscript/scriptinterface.h b/interfaces/kscript/scriptinterface.h
index 1c37b7f71..e711e82ca 100644
--- a/interfaces/kscript/scriptinterface.h
+++ b/interfaces/kscript/scriptinterface.h
@@ -44,7 +44,7 @@ class KScriptClientInterface;
* @author Ian Reinhart Geiser <geiseri@kde.org>
*
**/
- class KDE_EXPORT KScriptInterface : public TQObject
+ class KDE_EXPORT KScriptInterface : public QObject
{
Q_OBJECT
public:
diff --git a/interfaces/kscript/scriptloader.h b/interfaces/kscript/scriptloader.h
index 7de2bd5b0..20b135231 100644
--- a/interfaces/kscript/scriptloader.h
+++ b/interfaces/kscript/scriptloader.h
@@ -26,7 +26,7 @@
/**
* Script loader
*/
-class ScriptLoader : virtual public TQObject
+class ScriptLoader : virtual public QObject
{
Q_OBJECT
public:
diff --git a/interfaces/kscript/scriptmanager.cpp b/interfaces/kscript/scriptmanager.cpp
index 12ab08b93..5cdbd7459 100644
--- a/interfaces/kscript/scriptmanager.cpp
+++ b/interfaces/kscript/scriptmanager.cpp
@@ -126,7 +126,7 @@ void KScriptManager::runScript( const TQString &scriptName, TQObject *context, c
}
}
else
- KMessageBox::sorry(0, i18n("Unable tqfind script \"%1\".").arg(scriptName), i18n("KScript Error"));
+ KMessageBox::sorry(0, i18n("Unable find script \"%1\".").arg(scriptName), i18n("KScript Error"));
}
#include "scriptmanager.moc"
#include "scriptinterface.moc"
diff --git a/interfaces/kspeech/kspeech.h b/interfaces/kspeech/kspeech.h
index 35da55532..049afbfa2 100644
--- a/interfaces/kspeech/kspeech.h
+++ b/interfaces/kspeech/kspeech.h
@@ -442,7 +442,7 @@
* a Spanish synthesizer would likely be unintelligible). So the language
* attribute is said to have "priority".
* If an application does not specify a language attribute, a default one will be assumed.
- * The rest of the attributes are said to be "preferred". If %KTTSD cannot tqfind
+ * The rest of the attributes are said to be "preferred". If %KTTSD cannot find
* a talker with the exact preferred attributes requested, the closest matching
* talker will likely still be understandable.
*
@@ -458,7 +458,7 @@
* and Soft volume would not be picked as long as an English Female talker is
* available.
*
- * The algorithm used by %KTTSD to tqfind a matching talker is as follows:
+ * The algorithm used by %KTTSD to find a matching talker is as follows:
*
* - If language code is not specified by the application, assume default configured
* by user. The primary language code automatically has priority.
@@ -511,8 +511,8 @@
* and if there are none, display an error message to the user.
*
* Applications can implement their own talker-matching algorithm by
- * calling getTalkers, then tqfinding the desired talker from the returned
- * list. When the full talker code is passed in, %KKTSD will tqfind an exact
+ * calling getTalkers, then finding the desired talker from the returned
+ * list. When the full talker code is passed in, %KKTSD will find an exact
* match and use the specified talker.
*
* If an application requires a configuration that user has not created,
@@ -708,7 +708,7 @@ class KSpeech : virtual public DCOPObject {
* defaults to the closest matching talker.
*
* If an existing Screen Reader output is in progress, it is stopped and discarded and
- * tqreplaced with this new message.
+ * replaced with this new message.
*/
virtual ASYNC sayScreenReaderOutput(const TQString &msg, const TQString &talker) = 0;
@@ -748,14 +748,14 @@ class KSpeech : virtual public DCOPObject {
@endverbatim
*
* Note that backward slashes must be escaped.
- * When %KTTSD parses the text, it tqreplaces all tabs, spaces, and formfeeds
- * with a single space, and then tqreplaces the sentence delimiters using
+ * When %KTTSD parses the text, it replaces all tabs, spaces, and formfeeds
+ * with a single space, and then replaces the sentence delimiters using
* the following statement:
@verbatim
- TQString::tqreplace(sentenceDelimiter, "\\1\t");
+ TQString::replace(sentenceDelimiter, "\\1\t");
@endverbatim
*
- * which tqreplaces all sentence delimiters with a tab, but
+ * which replaces all sentence delimiters with a tab, but
* preserving the first capture text (first parenthesis). In other
* words, the sentence punctuation is preserved.
* The tab is later used to separate the text into sentences.
@@ -922,7 +922,7 @@ class KSpeech : virtual public DCOPObject {
* @return A TQDataStream containing information about the job.
* Blank if no such job.
*
- * The stream tqcontains the following elements:
+ * The stream contains the following elements:
* - int state - Job state.
* - TQCString appId - DCOP senderId of the application that requested the speech job.
* - TQString talker - Talker Code requested by application.
diff --git a/interfaces/ktexteditor/.kateconfig b/interfaces/ktexteditor/.kateconfig
index 46471127e..5b0885abe 100644
--- a/interfaces/ktexteditor/.kateconfig
+++ b/interfaces/ktexteditor/.kateconfig
@@ -1 +1 @@
-kate: space-indent on; indent-width 2; tqreplace-tabs on;
+kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/interfaces/ktexteditor/blockselectiondcopinterface.h b/interfaces/ktexteditor/blockselectiondcopinterface.h
index 66045239b..4b74fd2a0 100644
--- a/interfaces/ktexteditor/blockselectiondcopinterface.h
+++ b/interfaces/ktexteditor/blockselectiondcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
Construct a new interface object for the text editor.
@param Parent the parent BlockSelectionInterface object
that will provide us with the functions for the interface.
- @param name the TQObject's name
+ @param name the QObject's name
*/
BlockSelectionDCOPInterface( BlockSelectionInterface *Parent, const char *name );
/**
diff --git a/interfaces/ktexteditor/clipboarddcopinterface.h b/interfaces/ktexteditor/clipboarddcopinterface.h
index 9a75f9b97..8104e9d4d 100644
--- a/interfaces/ktexteditor/clipboarddcopinterface.h
+++ b/interfaces/ktexteditor/clipboarddcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
Construct a new interface object for the text editor.
@param Parent the parent ClipboardInterface object
that will provide us with the functions for the interface.
- @param name the TQObject's name
+ @param name the QObject's name
*/
ClipboardDCOPInterface( ClipboardInterface *Parent, const char *name );
/**
diff --git a/interfaces/ktexteditor/documentdcopinfo.h b/interfaces/ktexteditor/documentdcopinfo.h
index aedaee6a5..ea25284fe 100644
--- a/interfaces/ktexteditor/documentdcopinfo.h
+++ b/interfaces/ktexteditor/documentdcopinfo.h
@@ -25,7 +25,7 @@ namespace KTextEditor
Construct a new interface object for the text editor.
@param Parent the parent DocumentInfoInterface object
that will provide us with the functions for the interface.
- @param name the TQObject's name
+ @param name the QObject's name
*/
DocumentInfoDCOPInterface( DocumentInfoInterface *Parent, const char *name );
/**
diff --git a/interfaces/ktexteditor/editdcopinterface.h b/interfaces/ktexteditor/editdcopinterface.h
index 5b4a6ebb7..f169fb15b 100644
--- a/interfaces/ktexteditor/editdcopinterface.h
+++ b/interfaces/ktexteditor/editdcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
Construct a new interface object for the text editor.
@param Parent the parent EditInterface object
that will provide us with the functions for the interface.
- @param name the TQObject's name
+ @param name the QObject's name
*/
EditDCOPInterface( EditInterface *Parent, const char *name );
/**
diff --git a/interfaces/ktexteditor/editinterfaceext.h b/interfaces/ktexteditor/editinterfaceext.h
index e5f2d9101..650bb9ec2 100644
--- a/interfaces/ktexteditor/editinterfaceext.h
+++ b/interfaces/ktexteditor/editinterfaceext.h
@@ -44,7 +44,7 @@ class KTEXTEDITOR_EXPORT EditInterfaceExt
/**
* Begin an editing sequence. Edit commands during this sequence will be
* bunched together such that they represent a single undo command in the
- * editor, and so that tqrepaint events do not occur inbetween.
+ * editor, and so that repaint events do not occur inbetween.
*
* Your application should not return control to the event loop while it
* has an unterminated (no matching editEnd() call) editing sequence
diff --git a/interfaces/ktexteditor/editor.h b/interfaces/ktexteditor/editor.h
index 79c731584..11f9a8c15 100644
--- a/interfaces/ktexteditor/editor.h
+++ b/interfaces/ktexteditor/editor.h
@@ -32,7 +32,7 @@ namespace KTextEditor
* Usage: Load it, merge it's gui + be happy
* Extensibility: Use the Document / View classes if you want
* advanced features, interfaces, etc. This class is just a good text editor
- * widget tqreplacement for applications which just need an embedded text edtor
+ * widget replacement for applications which just need an embedded text edtor
* and are not interested in using advanced interfaces.
*/
@@ -57,7 +57,7 @@ class KTEXTEDITOR_EXPORT Editor : public KParts::ReadWritePart
unsigned int myEditorNumber;
};
-KTEXTEDITOR_EXPORT Editor *createEditor ( const char* libname, TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0 );
+KTEXTEDITOR_EXPORT Editor *createEditor ( const char* libname, TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0 );
}
diff --git a/interfaces/ktexteditor/editorchooser.cpp b/interfaces/ktexteditor/editorchooser.cpp
index 0d48f6b75..96cf3649e 100644
--- a/interfaces/ktexteditor/editorchooser.cpp
+++ b/interfaces/ktexteditor/editorchooser.cpp
@@ -55,7 +55,7 @@ EditorChooser::EditorChooser(TQWidget *parent,const char *name) :
for (KTrader::OfferList::Iterator it = offers.begin(); it != offers.end(); ++it)
{
- if ((*it)->desktopEntryName().tqcontains(editor))
+ if ((*it)->desktopEntryName().contains(editor))
{
d->chooser->editorCombo->insertItem(i18n("System Default (%1)").arg((*it)->name()));
break;
@@ -82,7 +82,7 @@ void EditorChooser::readAppSetting(const TQString& postfix){
if (editor.isEmpty()) d->chooser->editorCombo->setCurrentItem(0);
else
{
- int idx=d->elements.tqfindIndex(editor);
+ int idx=d->elements.findIndex(editor);
idx=idx+1;
d->chooser->editorCombo->setCurrentItem(idx);
}
@@ -130,7 +130,7 @@ KTextEditor::Document *EditorChooser::createDocument(TQObject *parent,const char
return 0;
}
-KTextEditor::Editor *EditorChooser::createEditor(TQWidget *tqparentWidget,TQObject *parent,const char* widgetName,
+KTextEditor::Editor *EditorChooser::createEditor(TQWidget *parentWidget,TQObject *parent,const char* widgetName,
const char* name,const TQString& postfix,bool fallBackToKatePart){
KTextEditor::Editor *tmpEd=0;
@@ -151,11 +151,11 @@ KTextEditor::Editor *EditorChooser::createEditor(TQWidget *tqparentWidget,TQObje
KService::Ptr serv=KService::serviceByDesktopName(editor);
if (serv)
{
- tmpEd=KTextEditor::createEditor(serv->library().latin1(),tqparentWidget,widgetName,parent,name);
+ tmpEd=KTextEditor::createEditor(serv->library().latin1(),parentWidget,widgetName,parent,name);
if (tmpEd) return tmpEd;
}
if (fallBackToKatePart)
- return KTextEditor::createEditor("libkatepart",tqparentWidget,widgetName,parent,name);
+ return KTextEditor::createEditor("libkatepart",parentWidget,widgetName,parent,name);
return 0;
}
diff --git a/interfaces/ktexteditor/editorchooser.h b/interfaces/ktexteditor/editorchooser.h
index bf09907d4..20fba94e1 100644
--- a/interfaces/ktexteditor/editorchooser.h
+++ b/interfaces/ktexteditor/editorchooser.h
@@ -28,7 +28,7 @@ class KTEXTEDITOR_EXPORT EditorChooser: public QWidget
void writeAppSetting(const TQString& postfix=TQString::null);
static KTextEditor::Document *createDocument(TQObject* parent=0,const char *name=0,const TQString& postfix=TQString::null, bool fallBackToKatePart=true);
- static KTextEditor::Editor *createEditor(TQWidget *tqparentWidget,TQObject *parent,const char* widgetName=0,const char* name=0,const TQString& postfix=TQString::null,bool fallBackToKatePart=true);
+ static KTextEditor::Editor *createEditor(TQWidget *parentWidget,TQObject *parent,const char* widgetName=0,const char* name=0,const TQString& postfix=TQString::null,bool fallBackToKatePart=true);
private:
class PrivateEditorChooser *d;
};
diff --git a/interfaces/ktexteditor/editorchooser_ui.ui b/interfaces/ktexteditor/editorchooser_ui.ui
index ff6b7eba3..fa1d99184 100644
--- a/interfaces/ktexteditor/editorchooser_ui.ui
+++ b/interfaces/ktexteditor/editorchooser_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>EditorChooser</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -21,7 +21,7 @@
</property>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
@@ -31,7 +31,7 @@
<property name="name">
<cstring>TextLabel1</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>460</width>
<height>0</height>
@@ -40,7 +40,7 @@
<property name="text">
<string>Please choose the default text editing component that you wish to use in this application. If you choose &lt;B&gt;System Default&lt;/B&gt;, the application will honor your changes in the Control Center. All other choices will override that setting.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter|AlignLeft</set>
</property>
</widget>
@@ -59,6 +59,6 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/interfaces/ktexteditor/encodingdcopinterface.h b/interfaces/ktexteditor/encodingdcopinterface.h
index e13a6dff4..38de4e0aa 100644
--- a/interfaces/ktexteditor/encodingdcopinterface.h
+++ b/interfaces/ktexteditor/encodingdcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
Construct a new interface object for the text editor.
@param Parent the parent EncodingInterface object
that will provide us with the functions for the interface.
- @param name the TQObject's name
+ @param name the QObject's name
*/
EncodingDCOPInterface( EncodingInterface *Parent, const char *name );
/**
diff --git a/interfaces/ktexteditor/ktexteditor.cpp b/interfaces/ktexteditor/ktexteditor.cpp
index ef199c819..0b50fdaeb 100644
--- a/interfaces/ktexteditor/ktexteditor.cpp
+++ b/interfaces/ktexteditor/ktexteditor.cpp
@@ -206,9 +206,9 @@ unsigned int Editor::editorNumber () const
return myEditorNumber;
}
-Editor *KTextEditor::createEditor ( const char* libname, TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name )
+Editor *KTextEditor::createEditor ( const char* libname, TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name )
{
- return KParts::ComponentFactory::createPartInstanceFromLibrary<Editor>( libname, tqparentWidget, widgetName, parent, name );
+ return KParts::ComponentFactory::createPartInstanceFromLibrary<Editor>( libname, parentWidget, widgetName, parent, name );
}
Document *KTextEditor::createDocument ( const char* libname, TQObject *parent, const char *name )
diff --git a/interfaces/ktexteditor/markinterface.h b/interfaces/ktexteditor/markinterface.h
index 7c8b0212f..d3b3dbe7f 100644
--- a/interfaces/ktexteditor/markinterface.h
+++ b/interfaces/ktexteditor/markinterface.h
@@ -63,7 +63,7 @@ class KTEXTEDITOR_EXPORT MarkInterface
/**
* Adds a mark of type @p markType to @p line.
- * Has no effect if the line allready tqcontains a mark of that type.
+ * Has no effect if the line allready contains a mark of that type.
*/
virtual void setMark (uint line, uint markType) = 0;
/**
diff --git a/interfaces/ktexteditor/plugin.h b/interfaces/ktexteditor/plugin.h
index 71266d3e2..dc7978f92 100644
--- a/interfaces/ktexteditor/plugin.h
+++ b/interfaces/ktexteditor/plugin.h
@@ -33,7 +33,7 @@ class View;
* Basic KTextEditor plugin class.
* This plugin will be bound to a Document.
*/
-class KTEXTEDITOR_EXPORT Plugin : public TQObject
+class KTEXTEDITOR_EXPORT Plugin : public QObject
{
friend class PrivatePlugin;
diff --git a/interfaces/ktexteditor/printdcopinterface.h b/interfaces/ktexteditor/printdcopinterface.h
index f3d176fbd..e41e6da5d 100644
--- a/interfaces/ktexteditor/printdcopinterface.h
+++ b/interfaces/ktexteditor/printdcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
Construct a new interface object for the text editor.
@param Parent the parent PrintInterface object
that will provide us with the functions for the interface.
- @param name the TQObject's name
+ @param name the QObject's name
*/
PrintDCOPInterface( PrintInterface *Parent, const char *name );
/**
diff --git a/interfaces/ktexteditor/searchdcopinterface.cpp b/interfaces/ktexteditor/searchdcopinterface.cpp
index 81834cef2..ce29e4927 100644
--- a/interfaces/ktexteditor/searchdcopinterface.cpp
+++ b/interfaces/ktexteditor/searchdcopinterface.cpp
@@ -20,16 +20,16 @@ SearchDCOPInterface::~SearchDCOPInterface()
}
-bool SearchDCOPInterface::tqfindFirstString( TQString text, bool caseSensitive)
+bool SearchDCOPInterface::findFirstString( TQString text, bool caseSensitive)
{
return m_parent->searchText(0, 0, text, &m_currentrow, &m_currentcol, &m_currentmatchlen, caseSensitive);
}
-bool SearchDCOPInterface::tqfindNextString( TQString text, bool caseSensitive)
+bool SearchDCOPInterface::findNextString( TQString text, bool caseSensitive)
{
return m_parent->searchText(m_currentrow, m_currentcol+1, text, &m_currentrow, &m_currentcol, &m_currentmatchlen, caseSensitive);
}
-bool SearchDCOPInterface::tqfindPreviousString( TQString text, bool caseSensitive)
+bool SearchDCOPInterface::findPreviousString( TQString text, bool caseSensitive)
{
if( m_currentcol == 0)
m_currentrow--;
@@ -38,28 +38,28 @@ bool SearchDCOPInterface::tqfindPreviousString( TQString text, bool caseSensitiv
return m_parent->searchText(m_currentrow, m_currentcol, text, &m_currentrow, &m_currentcol, &m_currentmatchlen, caseSensitive, true);
}
-bool SearchDCOPInterface::tqfindLastString( TQString text, bool caseSensitive)
+bool SearchDCOPInterface::findLastString( TQString text, bool caseSensitive)
{
return m_parent->searchText(0,0, text, &m_currentrow, &m_currentcol, &m_currentmatchlen, caseSensitive, true);
}
-bool SearchDCOPInterface::tqfindStringAt( uint row, uint col, TQString text, bool caseSensitive)
+bool SearchDCOPInterface::findStringAt( uint row, uint col, TQString text, bool caseSensitive)
{
return m_parent->searchText(row,col, text, &m_currentrow, &m_currentcol, &m_currentmatchlen, caseSensitive);
}
-bool SearchDCOPInterface::tqfindFirstRegExp( TQString regexp)
+bool SearchDCOPInterface::findFirstRegExp( TQString regexp)
{
return m_parent->searchText( 0,0, TQRegExp(regexp), &m_currentrow, &m_currentcol, &m_currentmatchlen);
}
-bool SearchDCOPInterface::tqfindNextRegExp( TQString regexp)
+bool SearchDCOPInterface::findNextRegExp( TQString regexp)
{
return m_parent->searchText( m_currentrow, m_currentcol+1, TQRegExp(regexp), &m_currentrow, &m_currentcol, &m_currentmatchlen);
}
-bool SearchDCOPInterface::tqfindPreviousRegExp( TQString regexp)
+bool SearchDCOPInterface::findPreviousRegExp( TQString regexp)
{
if( m_currentcol == 0)
m_currentrow--;
@@ -69,12 +69,12 @@ bool SearchDCOPInterface::tqfindPreviousRegExp( TQString regexp)
}
-bool SearchDCOPInterface::tqfindLastRegExp(TQString regexp)
+bool SearchDCOPInterface::findLastRegExp(TQString regexp)
{
return m_parent->searchText( 0,0, TQRegExp(regexp), &m_currentrow, &m_currentcol, &m_currentmatchlen, true);
}
-bool SearchDCOPInterface::tqfindRegExpAt( uint row, uint col, TQString regexp)
+bool SearchDCOPInterface::findRegExpAt( uint row, uint col, TQString regexp)
{
return m_parent->searchText( row, col, TQRegExp(regexp), &m_currentrow, &m_currentcol, &m_currentmatchlen, false);
}
diff --git a/interfaces/ktexteditor/searchdcopinterface.h b/interfaces/ktexteditor/searchdcopinterface.h
index 298cf8962..d4f558a26 100644
--- a/interfaces/ktexteditor/searchdcopinterface.h
+++ b/interfaces/ktexteditor/searchdcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
Construct a new interface object for the text editor.
@param Parent the parent SearchInterface object
that will provide us with the functions for the interface.
- @param name the TQObject's name
+ @param name the QObject's name
*/
SearchDCOPInterface( SearchInterface *Parent, const char *name );
/**
@@ -33,17 +33,17 @@ namespace KTextEditor
**/
virtual ~SearchDCOPInterface();
k_dcop:
- bool tqfindFirstString(TQString text, bool caseSensitive);
- bool tqfindNextString(TQString text, bool caseSensitive);
- bool tqfindPreviousString( TQString text, bool caseSensitive);
- bool tqfindLastString(TQString text, bool caseSensitive);
- bool tqfindStringAt( uint row, uint col, TQString text, bool caseSensitive);
+ bool findFirstString(TQString text, bool caseSensitive);
+ bool findNextString(TQString text, bool caseSensitive);
+ bool findPreviousString( TQString text, bool caseSensitive);
+ bool findLastString(TQString text, bool caseSensitive);
+ bool findStringAt( uint row, uint col, TQString text, bool caseSensitive);
- bool tqfindFirstRegExp( TQString regexp);
- bool tqfindNextRegExp( TQString regexp);
- bool tqfindPreviousRegExp( TQString regexp);
- bool tqfindLastRegExp( TQString regexp);
- bool tqfindRegExpAt( uint row, uint col, TQString regexp);
+ bool findFirstRegExp( TQString regexp);
+ bool findNextRegExp( TQString regexp);
+ bool findPreviousRegExp( TQString regexp);
+ bool findLastRegExp( TQString regexp);
+ bool findRegExpAt( uint row, uint col, TQString regexp);
uint currentMatchLine();
uint currentMatchCol();
diff --git a/interfaces/ktexteditor/selectiondcopinterface.h b/interfaces/ktexteditor/selectiondcopinterface.h
index 70e6e2f0b..aa2973540 100644
--- a/interfaces/ktexteditor/selectiondcopinterface.h
+++ b/interfaces/ktexteditor/selectiondcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
Construct a new interface object for the text editor.
@param Parent the parent SelectionInterface object
that will provide us with the functions for the interface.
- @param name the TQObject's name
+ @param name the QObject's name
*/
SelectionDCOPInterface( SelectionInterface *Parent, const char *name );
/**
diff --git a/interfaces/ktexteditor/templateinterface.cpp b/interfaces/ktexteditor/templateinterface.cpp
index f84ab691b..4f9f83706 100644
--- a/interfaces/ktexteditor/templateinterface.cpp
+++ b/interfaces/ktexteditor/templateinterface.cpp
@@ -74,7 +74,7 @@ bool TemplateInterface::expandMacros( TQMap<TQString, TQString> &map, TQWidget *
{
KABC::StdAddressBook *addrBook = 0;
KABC::Addressee userAddress;
- TQDateTime datetime = TQDateTime::tqcurrentDateTime();
+ TQDateTime datetime = TQDateTime::currentDateTime();
TQDate date = datetime.date();
TQTime time = datetime.time();
@@ -173,7 +173,7 @@ bool TemplateInterface::insertTemplateText ( uint line, uint column, const TQStr
}
}
TQString placeholder = rx.cap( 1 );
- if ( ! enhancedInitValues.tqcontains( placeholder ) )
+ if ( ! enhancedInitValues.contains( placeholder ) )
enhancedInitValues[ placeholder ] = "";
pos += rx.matchedLength();
diff --git a/interfaces/ktexteditor/templateinterface.h b/interfaces/ktexteditor/templateinterface.h
index f31daeb3b..ec864a5e4 100644
--- a/interfaces/ktexteditor/templateinterface.h
+++ b/interfaces/ktexteditor/templateinterface.h
@@ -43,7 +43,7 @@ class KTEXTEDITOR_EXPORT TemplateInterface //should be named AbstractTemplateInt
virtual ~TemplateInterface();
/**
- * Parses @p templateString for macros in the form [$%]{NAME} and tqfinds
+ * Parses @p templateString for macros in the form [$%]{NAME} and finds
* the value corresponding to NAME if any. The NAME string may contain
* any non-whitespace character execpt '}'
* @param initialValues a map with the keys for the macros to expand.
@@ -101,7 +101,7 @@ class KTEXTEDITOR_EXPORT TemplateInterface //should be named AbstractTemplateInt
* differing from the macro name is found.
*
* If the editor supports some kind of smart indentation, the inserted code
- * should be tqlayouted by the indenter.
+ * should be layouted by the indenter.
*/
bool insertTemplateText ( uint line, uint column, const TQString &templateString, const TQMap<TQString,TQString> &initialValues, TQWidget *parentWindow=0);
diff --git a/interfaces/ktexteditor/undodcopinterface.h b/interfaces/ktexteditor/undodcopinterface.h
index 5e324da03..b1a217036 100644
--- a/interfaces/ktexteditor/undodcopinterface.h
+++ b/interfaces/ktexteditor/undodcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
Construct a new interface object for the text editor.
@param Parent the parent UndoInterface object
that will provide us with the functions for the interface.
- @param name the TQObject's name
+ @param name the QObject's name
*/
UndoDCOPInterface( UndoInterface *Parent, const char *name );
/**
diff --git a/interfaces/ktexteditor/viewcursordcopinterface.h b/interfaces/ktexteditor/viewcursordcopinterface.h
index e0c956da0..4bae0b520 100644
--- a/interfaces/ktexteditor/viewcursordcopinterface.h
+++ b/interfaces/ktexteditor/viewcursordcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
Construct a new interface object for the text editor.
@param Parent the parent ViewCursorInterface object
that will provide us with the functions for the interface.
- @param name the TQObject's name
+ @param name the QObject's name
*/
ViewCursorDCOPInterface( ViewCursorInterface *Parent, const char *name );
/**
diff --git a/interfaces/ktexteditor/viewstatusmsgdcopinterface.cpp b/interfaces/ktexteditor/viewstatusmsgdcopinterface.cpp
index b629cfc40..d38b9b938 100644
--- a/interfaces/ktexteditor/viewstatusmsgdcopinterface.cpp
+++ b/interfaces/ktexteditor/viewstatusmsgdcopinterface.cpp
@@ -6,24 +6,24 @@
#include <dcopclient.h>
using namespace KTextEditor;
-ViewtqStatusMsgDCOPInterface::ViewtqStatusMsgDCOPInterface( ViewtqStatusMsgInterface *Parent, const char *name)
+ViewStatusMsgDCOPInterface::ViewStatusMsgDCOPInterface( ViewStatusMsgInterface *Parent, const char *name)
: DCOPObject(name)
{
m_parent = Parent;
}
-ViewtqStatusMsgDCOPInterface::~ViewtqStatusMsgDCOPInterface()
+ViewStatusMsgDCOPInterface::~ViewStatusMsgDCOPInterface()
{
}
-uint ViewtqStatusMsgDCOPInterface::viewtqStatusMsgInterfaceNumber ()
+uint ViewStatusMsgDCOPInterface::viewStatusMsgInterfaceNumber ()
{
- return m_parent->viewtqStatusMsgInterfaceNumber ();
+ return m_parent->viewStatusMsgInterfaceNumber ();
}
-void ViewtqStatusMsgDCOPInterface::viewtqStatusMsg (TQString msg)
+void ViewStatusMsgDCOPInterface::viewStatusMsg (TQString msg)
{
- m_parent->viewtqStatusMsg(msg);
+ m_parent->viewStatusMsg(msg);
}
diff --git a/interfaces/ktexteditor/viewstatusmsgdcopinterface.h b/interfaces/ktexteditor/viewstatusmsgdcopinterface.h
index 3bdba906a..b4c5cf72e 100644
--- a/interfaces/ktexteditor/viewstatusmsgdcopinterface.h
+++ b/interfaces/ktexteditor/viewstatusmsgdcopinterface.h
@@ -1,5 +1,5 @@
-#ifndef ViewtqStatusMsg_DCOP_INTERFACE_H
-#define ViewtqStatusMsg_DCOP_INTERFACE_H
+#ifndef ViewStatusMsg_DCOP_INTERFACE_H
+#define ViewStatusMsg_DCOP_INTERFACE_H
#include <dcopobject.h>
#include <dcopref.h>
@@ -8,36 +8,36 @@
//#include "editdcopinterface.moc"
namespace KTextEditor
{
- class ViewtqStatusMsgInterface;
+ class ViewStatusMsgInterface;
/**
- This is the main interface to the ViewtqStatusMsgInterface of KTextEdit.
+ This is the main interface to the ViewStatusMsgInterface of KTextEdit.
This will provide a consistant dcop interface to all KDE applications that use it.
- @short DCOP interface to ViewtqStatusMsgInterface.
+ @short DCOP interface to ViewStatusMsgInterface.
@author Ian Reinhart Geiser <geiseri@kde.org>
*/
- class KTEXTEDITOR_EXPORT ViewtqStatusMsgDCOPInterface : virtual public DCOPObject
+ class KTEXTEDITOR_EXPORT ViewStatusMsgDCOPInterface : virtual public DCOPObject
{
K_DCOP
public:
/**
Construct a new interface object for the text editor.
- @param Parent the parent ViewtqStatusMsgInterface object
+ @param Parent the parent ViewStatusMsgInterface object
that will provide us with the functions for the interface.
- @param name the TQObject's name
+ @param name the QObject's name
*/
- ViewtqStatusMsgDCOPInterface( ViewtqStatusMsgInterface *Parent, const char *name );
+ ViewStatusMsgDCOPInterface( ViewStatusMsgInterface *Parent, const char *name );
/**
Destructor
Cleans up the object.
*/
- virtual ~ViewtqStatusMsgDCOPInterface();
+ virtual ~ViewStatusMsgDCOPInterface();
k_dcop:
- uint viewtqStatusMsgInterfaceNumber ();
- void viewtqStatusMsg (class TQString msg) ;
+ uint viewStatusMsgInterfaceNumber ();
+ void viewStatusMsg (class TQString msg) ;
private:
- ViewtqStatusMsgInterface *m_parent;
+ ViewStatusMsgInterface *m_parent;
};
}
#endif
diff --git a/interfaces/ktexteditor/viewstatusmsginterface.cpp b/interfaces/ktexteditor/viewstatusmsginterface.cpp
index 371cb15e3..ff0815c89 100644
--- a/interfaces/ktexteditor/viewstatusmsginterface.cpp
+++ b/interfaces/ktexteditor/viewstatusmsginterface.cpp
@@ -27,50 +27,50 @@
namespace KTextEditor
{
-class PrivateViewtqStatusMsgInterface
+class PrivateViewStatusMsgInterface
{
public:
- PrivateViewtqStatusMsgInterface() {interface=0;}
- ~PrivateViewtqStatusMsgInterface() {}
- ViewtqStatusMsgDCOPInterface *interface;
+ PrivateViewStatusMsgInterface() {interface=0;}
+ ~PrivateViewStatusMsgInterface() {}
+ ViewStatusMsgDCOPInterface *interface;
};
}
using namespace KTextEditor;
-unsigned int ViewtqStatusMsgInterface::globalViewtqStatusMsgInterfaceNumber = 0;
+unsigned int ViewStatusMsgInterface::globalViewStatusMsgInterfaceNumber = 0;
-ViewtqStatusMsgInterface::ViewtqStatusMsgInterface()
+ViewStatusMsgInterface::ViewStatusMsgInterface()
{
- globalViewtqStatusMsgInterfaceNumber++;
- myViewtqStatusMsgInterfaceNumber = globalViewtqStatusMsgInterfaceNumber++;
+ globalViewStatusMsgInterfaceNumber++;
+ myViewStatusMsgInterfaceNumber = globalViewStatusMsgInterfaceNumber++;
- d = new PrivateViewtqStatusMsgInterface();
- ::TQString name = "ViewtqStatusMsgInterface#" + ::TQString::number(myViewtqStatusMsgInterfaceNumber);
- d->interface = new ViewtqStatusMsgDCOPInterface(this, name.latin1());
+ d = new PrivateViewStatusMsgInterface();
+ ::TQString name = "ViewStatusMsgInterface#" + ::TQString::number(myViewStatusMsgInterfaceNumber);
+ d->interface = new ViewStatusMsgDCOPInterface(this, name.latin1());
}
-ViewtqStatusMsgInterface::~ViewtqStatusMsgInterface()
+ViewStatusMsgInterface::~ViewStatusMsgInterface()
{
delete d->interface;
delete d;
}
-unsigned int ViewtqStatusMsgInterface::viewtqStatusMsgInterfaceNumber () const
+unsigned int ViewStatusMsgInterface::viewStatusMsgInterfaceNumber () const
{
- return myViewtqStatusMsgInterfaceNumber;
+ return myViewStatusMsgInterfaceNumber;
}
-void ViewtqStatusMsgInterface::setViewtqStatusMsgInterfaceDCOPSuffix (const TQCString &suffix)
+void ViewStatusMsgInterface::setViewStatusMsgInterfaceDCOPSuffix (const TQCString &suffix)
{
- d->interface->setObjId ("ViewtqStatusMsgInterface#"+suffix);
+ d->interface->setObjId ("ViewStatusMsgInterface#"+suffix);
}
-ViewtqStatusMsgInterface *KTextEditor::viewtqStatusMsgInterface (View *view)
+ViewStatusMsgInterface *KTextEditor::viewStatusMsgInterface (View *view)
{
if (!view)
return 0;
- return static_cast<ViewtqStatusMsgInterface*>(view->qt_cast("KTextEditor::ViewtqStatusMsgInterface"));
+ return static_cast<ViewStatusMsgInterface*>(view->qt_cast("KTextEditor::ViewStatusMsgInterface"));
}
diff --git a/interfaces/ktexteditor/viewstatusmsginterface.h b/interfaces/ktexteditor/viewstatusmsginterface.h
index 7286a9528..d692f3b7b 100644
--- a/interfaces/ktexteditor/viewstatusmsginterface.h
+++ b/interfaces/ktexteditor/viewstatusmsginterface.h
@@ -30,33 +30,33 @@ namespace KTextEditor
/**
* This is an interface for retrieving status bar messages from the Document class.
*/
-class KTEXTEDITOR_EXPORT ViewtqStatusMsgInterface
+class KTEXTEDITOR_EXPORT ViewStatusMsgInterface
{
- friend class PrivateViewtqStatusMsgInterface;
+ friend class PrivateViewStatusMsgInterface;
public:
- ViewtqStatusMsgInterface();
- virtual ~ViewtqStatusMsgInterface();
+ ViewStatusMsgInterface();
+ virtual ~ViewStatusMsgInterface();
- unsigned int viewtqStatusMsgInterfaceNumber () const;
+ unsigned int viewStatusMsgInterfaceNumber () const;
protected:
- void setViewtqStatusMsgInterfaceDCOPSuffix (const TQCString &suffix);
+ void setViewStatusMsgInterfaceDCOPSuffix (const TQCString &suffix);
//
// signals !!!
//
public:
- virtual void viewtqStatusMsg (const class TQString &msg) = 0;
+ virtual void viewStatusMsg (const class TQString &msg) = 0;
private:
- class PrivateViewtqStatusMsgInterface *d;
- static unsigned int globalViewtqStatusMsgInterfaceNumber;
- unsigned int myViewtqStatusMsgInterfaceNumber;
+ class PrivateViewStatusMsgInterface *d;
+ static unsigned int globalViewStatusMsgInterfaceNumber;
+ unsigned int myViewStatusMsgInterfaceNumber;
};
-KTEXTEDITOR_EXPORT ViewtqStatusMsgInterface *viewtqStatusMsgInterface (class View *view);
+KTEXTEDITOR_EXPORT ViewStatusMsgInterface *viewStatusMsgInterface (class View *view);
}