diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:48:31 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:48:31 -0600 |
commit | c48e769eb275917717e2b55eb869f7e559293ac8 (patch) | |
tree | 8f650b907e21c918b826f854dbe1c8174cc2c0c6 /ksirc | |
parent | 8011d84f483f3628f3f04ea5cb2c1c3c86b2dba7 (diff) | |
download | tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.tar.gz tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'ksirc')
-rw-r--r-- | ksirc/KSOpenkSirc/serverFileParser.cpp | 2 | ||||
-rw-r--r-- | ksirc/KSPrefs/page_general.cpp | 2 | ||||
-rw-r--r-- | ksirc/chanparser.cpp | 2 | ||||
-rw-r--r-- | ksirc/iocontroller.cpp | 48 | ||||
-rw-r--r-- | ksirc/iocontroller.h | 14 | ||||
-rw-r--r-- | ksirc/ksircprocess.cpp | 10 | ||||
-rw-r--r-- | ksirc/ksircprocess.h | 4 | ||||
-rw-r--r-- | ksirc/kstextview.cpp | 2 | ||||
-rw-r--r-- | ksirc/messageReceiver.cpp | 2 | ||||
-rw-r--r-- | ksirc/servercontroller.cpp | 2 | ||||
-rw-r--r-- | ksirc/servercontroller.h | 6 | ||||
-rw-r--r-- | ksirc/toplevel.cpp | 6 |
12 files changed, 50 insertions, 50 deletions
diff --git a/ksirc/KSOpenkSirc/serverFileParser.cpp b/ksirc/KSOpenkSirc/serverFileParser.cpp index 0b62b0dc..59288d00 100644 --- a/ksirc/KSOpenkSirc/serverFileParser.cpp +++ b/ksirc/KSOpenkSirc/serverFileParser.cpp @@ -109,6 +109,6 @@ int serverFileParser::readDatafile( const char *fileName ) int writeDataFile() { - TQString filename(KGlobal::dirs()->saveLocation("appdata")+"servers.txt"); + TQString filename(TDEGlobal::dirs()->saveLocation("appdata")+"servers.txt"); return 1; } diff --git a/ksirc/KSPrefs/page_general.cpp b/ksirc/KSPrefs/page_general.cpp index 51a78ec3..6bf8d476 100644 --- a/ksirc/KSPrefs/page_general.cpp +++ b/ksirc/KSPrefs/page_general.cpp @@ -82,7 +82,7 @@ void PageGeneral::readConfig( const KSOGeneral *opts ) encodingsCB->clear(); - TQStringList encodings = KGlobal::charsets()->descriptiveEncodingNames(); + TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames(); // remove utf16/ucs2 as it just doesn't work for IRC TQStringList::Iterator encodingIt = encodings.begin(); diff --git a/ksirc/chanparser.cpp b/ksirc/chanparser.cpp index aafaf395..d5215485 100644 --- a/ksirc/chanparser.cpp +++ b/ksirc/chanparser.cpp @@ -742,7 +742,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string) /* - * 1k is pretty safe since KProcess returns 1 k blocks, and lines don't get split between reads. This is emprical + * 1k is pretty safe since TDEProcess returns 1 k blocks, and lines don't get split between reads. This is emprical */ TQString modes, args, channel; int found = 0; diff --git a/ksirc/iocontroller.cpp b/ksirc/iocontroller.cpp index 9835a960..0545b189 100644 --- a/ksirc/iocontroller.cpp +++ b/ksirc/iocontroller.cpp @@ -34,23 +34,23 @@ Functions: public: - KSircIOController(KProcess*, KSircProcess*): - - Object constructor takes two arguements the KProcess + KSircIOController(TDEProcess*, KSircProcess*): + - Object constructor takes two arguements the TDEProcess that holds a running copy of sirc. - KSircProcess is saved for access latter to TopList. - - The receivedStdout signal from KProcess is connected to + - The receivedStdout signal from TDEProcess is connected to stdout_read and the processExited is connected to the sircDied slot. ~KSircIOController: does nothing at this time. public slots: - stdout_read(KProcess *, _buffer, buflen): + stdout_read(TDEProcess *, _buffer, buflen): - Called by kprocess when data arrives. - This function does all the parsing and sending of messages to each window. - stderr_read(KProcess*, _buffer, buflen): + stderr_read(TDEProcess*, _buffer, buflen): - Should be called for stderr data, not connected, does nothing. @@ -88,7 +88,7 @@ int KSircIOController::counter = 0; -KSircIOController::KSircIOController(KProcess *_proc, KSircProcess *_ksircproc) +KSircIOController::KSircIOController(TDEProcess *_proc, KSircProcess *_ksircproc) : TQObject() { @@ -103,20 +103,20 @@ KSircIOController::KSircIOController(KProcess *_proc, KSircProcess *_ksircproc) // Connect the data arrived // to sirc receive for adding // the main text window - connect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - this, TQT_SLOT(stdout_read(KProcess*, char*, int))); + connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQT_SLOT(stdout_read(TDEProcess*, char*, int))); // Connect the stderr data // to sirc receive for adding // the main text window - connect(proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), - this, TQT_SLOT(stderr_read(KProcess*, char*, int))); + connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQT_SLOT(stderr_read(TDEProcess*, char*, int))); - connect(proc, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(sircDied(KProcess *))); + connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(sircDied(TDEProcess *))); // Notify on sirc dying - connect(proc, TQT_SIGNAL(wroteStdin(KProcess*)), - this, TQT_SLOT(procCTS(KProcess*))); + connect(proc, TQT_SIGNAL(wroteStdin(TDEProcess*)), + this, TQT_SLOT(procCTS(TDEProcess*))); proc_CTS = TRUE; #if 0 showDebugTraffic(true); @@ -134,7 +134,7 @@ void my_print(const char *c){ fprintf(stderr, "\n"); } -void KSircIOController::stdout_read(KProcess *, char *_buffer, int buflen) +void KSircIOController::stdout_read(TDEProcess *, char *_buffer, int buflen) { /* @@ -243,8 +243,8 @@ void KSircIOController::stdout_read(KProcess *, char *_buffer, int buflen) line.remove(0, pos3+1); } } - TQString enc = KGlobal::charsets()->encodingForName( ksopts->channel["global"]["global"].encoding ); - TQTextCodec *qtc = KGlobal::charsets()->codecForName( enc ); + TQString enc = TDEGlobal::charsets()->encodingForName( ksopts->channel["global"]["global"].encoding ); + TQTextCodec *qtc = TDEGlobal::charsets()->codecForName( enc ); TQString qsname = qtc->toUnicode(name); /* char *b = tqstrdup(line); @@ -297,7 +297,7 @@ KSircIOController::~KSircIOController() delete m_debugLB; } -void KSircIOController::stderr_read(KProcess *p, char *b, int l) +void KSircIOController::stderr_read(TDEProcess *p, char *b, int l) { stdout_read(p, b, l); } @@ -318,7 +318,7 @@ void KSircIOController::stdin_write(TQCString s) if(proc_CTS == TRUE){ int len = buffer.length(); if(send_buf != 0x0){ - tqWarning("KProcess barfed in all clear signal again"); + tqWarning("TDEProcess barfed in all clear signal again"); delete[] send_buf; } send_buf = new char[len]; @@ -338,24 +338,24 @@ void KSircIOController::stdin_write(TQCString s) } if(buffer.length() > 5000){ - kdDebug(5008) << "IOController: KProcess barfing again!\n"; + kdDebug(5008) << "IOController: TDEProcess barfing again!\n"; } // write(sirc_stdin, s, s.length()); } -void KSircIOController::sircDied(KProcess *process) +void KSircIOController::sircDied(TDEProcess *process) { if ( process->exitStatus() == 0 ) return; - kdDebug(5008) << "IOController: KProcess died!\n"; + kdDebug(5008) << "IOController: TDEProcess died!\n"; ksircproc->TopList["!all"]->sirc_receive("*E* DSIRC IS DEAD"); ksircproc->TopList["!all"]->sirc_receive("*E* KSIRC WINDOW HALTED"); - ksircproc->TopList["!all"]->sirc_receive( TQCString( "*E* Tried to run: " ) + KGlobal::dirs()->findExe("dsirc").ascii() + TQCString( "\n" ) ); + ksircproc->TopList["!all"]->sirc_receive( TQCString( "*E* Tried to run: " ) + TDEGlobal::dirs()->findExe("dsirc").ascii() + TQCString( "\n" ) ); ksircproc->TopList["!all"]->sirc_receive("*E* DID YOU READ THE INSTALL INTRUCTIONS?"); } -void KSircIOController::procCTS ( KProcess *) +void KSircIOController::procCTS ( TDEProcess *) { proc_CTS = true; delete[] send_buf; diff --git a/ksirc/iocontroller.h b/ksirc/iocontroller.h index e9587ab6..67360219 100644 --- a/ksirc/iocontroller.h +++ b/ksirc/iocontroller.h @@ -3,7 +3,7 @@ #include <tqobject.h> -class KProcess; +class TDEProcess; class KSircProcess; class TQListBox; class TQListBoxItem; @@ -15,25 +15,25 @@ class KSircIOController : public TQObject friend class KSircProcess; public: - KSircIOController(KProcess *, KSircProcess *); + KSircIOController(TDEProcess *, KSircProcess *); virtual ~KSircIOController(); void showDebugTraffic(bool show); bool isDebugTraffic(); public slots: - virtual void stdout_read(KProcess *proc, char *_buffer, int buflen); - virtual void stderr_read(KProcess *proc, char *_buffer, int buflen); + virtual void stdout_read(TDEProcess *proc, char *_buffer, int buflen); + virtual void stderr_read(TDEProcess *proc, char *_buffer, int buflen); virtual void stdin_write(TQCString); - virtual void sircDied(KProcess *); + virtual void sircDied(TDEProcess *); virtual void appendDebug(TQString); protected slots: - virtual void procCTS(KProcess *); + virtual void procCTS(TDEProcess *); private slots: void showContextMenuOnDebugWindow( TQListBoxItem *, const TQPoint &pos ); @@ -41,7 +41,7 @@ private slots: private: TQCString holder; bool proc_CTS; - KProcess *proc; + TDEProcess *proc; KSircProcess *ksircproc; char *send_buf; diff --git a/ksirc/ksircprocess.cpp b/ksirc/ksircprocess.cpp index 8d2a0f0c..6d46bdba 100644 --- a/ksirc/ksircprocess.cpp +++ b/ksirc/ksircprocess.cpp @@ -67,7 +67,7 @@ KSircReceivers under control of this server, and includes such items as "!all" and "!default". All !name are control windows. - 2. Forks off a KProcess for sirc and passes it over to IOController + 2. Forks off a TDEProcess for sirc and passes it over to IOController which grabs and control's it's IO. 3. It then opens a "!default" window. This will receive all @@ -121,7 +121,7 @@ KSircProcess::KSircProcess( TQString &server_id, KSircServer &kss, TQObject * pa : TQObject(parent, name), m_kss(kss), m_serverid(server_id) { - proc = new KProcess(); + proc = new TDEProcess(); #ifndef NDEBUG if(getuid() != 0) @@ -165,7 +165,7 @@ KSircProcess::KSircProcess( TQString &server_id, KSircServer &kss, TQObject * pa kdDebug(5008) << "Set SIRCUSER to: " << qsUserID << endl; } - proc->setEnvironment("SIRCLIB", KGlobal::dirs()->findResourceDir("appdata", "ksirc.pl")); + proc->setEnvironment("SIRCLIB", TDEGlobal::dirs()->findResourceDir("appdata", "ksirc.pl")); proc->setEnvironment("SIRCWAIT", "1"); TQString env = locate("appdata", "ksircrc"); @@ -190,7 +190,7 @@ KSircProcess::KSircProcess( TQString &server_id, KSircServer &kss, TQObject * pa TQString sslopt; if(kss.usessl()) sslopt = "-S"; - *proc << "perl" << KGlobal::dirs()->findExe("dsirc") << "-8" << "-r" << sslopt; + *proc << "perl" << TDEGlobal::dirs()->findExe("dsirc") << "-8" << "-r" << sslopt; // Finally start the iocontroller. @@ -236,7 +236,7 @@ KSircProcess::KSircProcess( TQString &server_id, KSircServer &kss, TQObject * pa // Now that all windows are up, start sirc. - proc->start(KProcess::NotifyOnExit, KProcess::All); + proc->start(TDEProcess::NotifyOnExit, TDEProcess::All); // Intial commands to load ASAP. // turn on sirc ssfe mode TQCString command = "/eval $ssfe=1\n"; diff --git a/ksirc/ksircprocess.h b/ksirc/ksircprocess.h index 6c34485d..163dc903 100644 --- a/ksirc/ksircprocess.h +++ b/ksirc/ksircprocess.h @@ -11,7 +11,7 @@ class KSircTopLevel; #include "ksircserver.h" #include "ksircchannel.h" -class KProcess; +class TDEProcess; class KSircIOController; class KSircMessageReceiver; class KSircIOController; @@ -71,7 +71,7 @@ private: void cleanup(); KSircIOController *iocontrol; - KProcess *proc; + TDEProcess *proc; TQDict<KSircMessageReceiver> TopList; diff --git a/ksirc/kstextview.cpp b/ksirc/kstextview.cpp index ae6fb8c3..2879ce10 100644 --- a/ksirc/kstextview.cpp +++ b/ksirc/kstextview.cpp @@ -584,7 +584,7 @@ TQString Tokenizer::convertToRichText( const PString &ptext ) * KCharSet's fromEntity breaks) if ( ch == '<' || ch == '>' || ch == '&' ) { - TQString entity = KGlobal::charsets()->toEntity( ch ); + TQString entity = TDEGlobal::charsets()->toEntity( ch ); indexAdjustment = entity.length() - 1; result.replace( i, 1, entity ); } diff --git a/ksirc/messageReceiver.cpp b/ksirc/messageReceiver.cpp index e60d82e3..becfa79a 100644 --- a/ksirc/messageReceiver.cpp +++ b/ksirc/messageReceiver.cpp @@ -64,7 +64,7 @@ TQTextCodec *UnicodeMessageReceiver::encoder() const } if ( !m_encoder ) { - const_cast<UnicodeMessageReceiver *>( this )->m_encoder = KGlobal::charsets()->codecForName( m_encoding ); + const_cast<UnicodeMessageReceiver *>( this )->m_encoder = TDEGlobal::charsets()->codecForName( m_encoding ); assert( m_encoder ); } diff --git a/ksirc/servercontroller.cpp b/ksirc/servercontroller.cpp index bb558b3e..9f979369 100644 --- a/ksirc/servercontroller.cpp +++ b/ksirc/servercontroller.cpp @@ -182,7 +182,7 @@ servercontroller::servercontroller( TQWidget*, const char* name ) KHelpMenu *help = new KHelpMenu( this, kapp->aboutData() ); MenuBar->insertItem( KStdGuiItem::help().text(), help->menu() ); - m_kga = new KGlobalAccel(TQT_TQOBJECT(this), "globalAccess"); + m_kga = new TDEGlobalAccel(TQT_TQOBJECT(this), "globalAccess"); m_kga->insert("New Server", i18n("New Server"), i18n("This action allows you to open a new server more easily " "when in docked mode, since you don't need to click on the " diff --git a/ksirc/servercontroller.h b/ksirc/servercontroller.h index 585583b4..f6d8024d 100644 --- a/ksirc/servercontroller.h +++ b/ksirc/servercontroller.h @@ -34,7 +34,7 @@ class ProcCommand; class TQLabel; class KMenuBar; class KSircServer; -class KGlobalAccel; +class TDEGlobalAccel; class nickColourMaker; class dockServerController; @@ -116,7 +116,7 @@ public: void checkDocking(); - KGlobalAccel *getGlobalAccel(){ return m_kga; } + TDEGlobalAccel *getGlobalAccel(){ return m_kga; } signals: /** @@ -229,7 +229,7 @@ private: TQPopupMenu *options, *connections; int join_id, server_id; - KGlobalAccel *m_kga; + TDEGlobalAccel *m_kga; int open_toplevels; diff --git a/ksirc/toplevel.cpp b/ksirc/toplevel.cpp index 34e63182..264eecf3 100644 --- a/ksirc/toplevel.cpp +++ b/ksirc/toplevel.cpp @@ -174,7 +174,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf encodingAction = new KSelectAction( i18n( "&Encoding" ), 0, TQT_TQOBJECT(this) ); connect( encodingAction, TQT_SIGNAL( activated() ), this, TQT_SLOT( setEncoding() ) ); - TQStringList encodings = KGlobal::charsets()->descriptiveEncodingNames(); + TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames(); topicitem = file->insertItem(i18n("S&how Topic"), this, TQT_SLOT(toggleTopic()), CTRL + Key_O); if (isPrivateChat() || m_channelInfo.channel().startsWith("!no_channel")) { @@ -238,7 +238,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf pan = new TQSplitter(Qt::Horizontal, top, kstn + "splitter"); #if KDE_IS_VERSION(3,1,92) - pan->setOpaqueResize( KGlobalSettings::opaqueResize() ); + pan->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); #else pan->setOpaqueResize( true ); #endif @@ -603,7 +603,7 @@ void KSircTopLevel::setEncoding() } else { ksopts->chan(m_channelInfo).encoding = encodingAction->currentText(); - UnicodeMessageReceiver::setEncoding( KGlobal::charsets()->encodingForName( encodingAction->currentText() ) ); + UnicodeMessageReceiver::setEncoding( TDEGlobal::charsets()->encodingForName( encodingAction->currentText() ) ); } ksopts->save(KSOptions::Channels); } |