diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:22:10 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:22:10 -0600 |
commit | 3e4d718796cddcc798d9f737037ef4bad540a0af (patch) | |
tree | 69d0aaad3f8f46c1dbb4939b7fcda8e7de12c481 /ksirc | |
parent | 50d6569cdef5f0aac099f5d01864bd0e14f82ae3 (diff) | |
download | tdenetwork-3e4d718796cddcc798d9f737037ef4bad540a0af.tar.gz tdenetwork-3e4d718796cddcc798d9f737037ef4bad540a0af.zip |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'ksirc')
-rw-r--r-- | ksirc/KSTicker/ksttest.cpp | 2 | ||||
-rw-r--r-- | ksirc/dccMgrTest.cpp | 2 | ||||
-rw-r--r-- | ksirc/kstextview.cpp | 2 | ||||
-rw-r--r-- | ksirc/kstextviewtest.cpp | 2 | ||||
-rw-r--r-- | ksirc/toplevel.cpp | 10 |
5 files changed, 9 insertions, 9 deletions
diff --git a/ksirc/KSTicker/ksttest.cpp b/ksirc/KSTicker/ksttest.cpp index ab057cdd..2c633295 100644 --- a/ksirc/KSTicker/ksttest.cpp +++ b/ksirc/KSTicker/ksttest.cpp @@ -70,7 +70,7 @@ int main(int argc, char **argv){ aboutData.addAuthor("Andrew Stanley-Jones",I18N_NOOP("Original Author"), "asj-ksirc@cban.com"); TDECmdLineArgs::init( argc, argv, &aboutData ); - KApplication a(argc, argv); + TDEApplication a(argc, argv); kConfig = a.config(); diff --git a/ksirc/dccMgrTest.cpp b/ksirc/dccMgrTest.cpp index ac2b76cb..cd2d1f57 100644 --- a/ksirc/dccMgrTest.cpp +++ b/ksirc/dccMgrTest.cpp @@ -32,7 +32,7 @@ private: int main(int argc, char **argv){ - KApplication a(argc, argv, "dccMgrTest" ); + TDEApplication a(argc, argv, "dccMgrTest" ); dccManager kst(0, "toplevel"); Timer t(&kst); diff --git a/ksirc/kstextview.cpp b/ksirc/kstextview.cpp index 1817c4e8..ae6fb8c3 100644 --- a/ksirc/kstextview.cpp +++ b/ksirc/kstextview.cpp @@ -1962,7 +1962,7 @@ void TextView::contentsMouseReleaseEvent( TQMouseEvent *ev ) if (ev->button() & Qt::MidButton) { - emit pasteReq( KApplication::clipboard()->text( TQClipboard::Selection ) ); + emit pasteReq( TDEApplication::clipboard()->text( TQClipboard::Selection ) ); return; } } diff --git a/ksirc/kstextviewtest.cpp b/ksirc/kstextviewtest.cpp index ded2f45c..c3dadec6 100644 --- a/ksirc/kstextviewtest.cpp +++ b/ksirc/kstextviewtest.cpp @@ -27,7 +27,7 @@ private: int main( int argc, char **argv ) { - KApplication app( argc, argv, "kstextviewtest" ); + TDEApplication app( argc, argv, "kstextviewtest" ); KSirc::TextView view( 0 ); app.setMainWidget( &view ); diff --git a/ksirc/toplevel.cpp b/ksirc/toplevel.cpp index 57f26fb5..34e63182 100644 --- a/ksirc/toplevel.cpp +++ b/ksirc/toplevel.cpp @@ -218,7 +218,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf /* * Ok, let's look at the basic widget "layout" * Everything belongs to q TQFrame F, this is use so we - * can give the KApplication a single main client widget, which is needs. + * can give the TDEApplication a single main client widget, which is needs. * * A TQVbox and a TQHbox is used to ctronl the 3 sub widget * The Modified TQListBox is then added side by side with the User list box. @@ -271,7 +271,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf // f = new kstInside(top, TQString(TQObject::name()) + "_" + "kstIFrame"); top->setStretchFactor(pan, 1); - setCentralWidget(top); // Tell the KApplication what the main widget is. + setCentralWidget(top); // Tell the TDEApplication what the main widget is. logFile = 0; if ( ksopts->chan(m_channelInfo).logging && (m_channelInfo.channel() != "!no_channel" )) @@ -1497,8 +1497,8 @@ void KSircTopLevel::openQueryFromNick(const TQString &nick) void KSircTopLevel::pasteToWindow() { // Ctrl-V - //kdDebug(5008) << "Going to paste: " << KApplication::clipboard()->text( TQClipboard::Clipboard ) << endl; - slotTextDropped(KApplication::clipboard()->text( TQClipboard::Clipboard ) ); + //kdDebug(5008) << "Going to paste: " << TDEApplication::clipboard()->text( TQClipboard::Clipboard ) << endl; + slotTextDropped(TDEApplication::clipboard()->text( TQClipboard::Clipboard ) ); } void KSircTopLevel::pasteToNickList(int button, @@ -1510,7 +1510,7 @@ void KSircTopLevel::pasteToNickList(int button, emit open_toplevel(ci); TQStringList lines = TQStringList::split( '\n', - KApplication::clipboard()->text( TQClipboard::Selection ), + TDEApplication::clipboard()->text( TQClipboard::Selection ), true ); TQStringList::ConstIterator it = lines.begin(); TQStringList::ConstIterator end = lines.end(); |